updated the schema handler