Updated schema validation and template