more work on the schema