Put validation in the parser