Adding support for multiple schema validation