(master) added some schema validation stuff