Introduce better data validation in schema with more custom types