Turn off validation in production
The beginning of a more robust parser