Improved the schema.