Added support for schema validations