Added schema validators
Moved from metadata them