modified the schema handler