More improvements to the schema