Improving the schema.