Move schema validation to load schema