adding support for schema checking