Refactored schema.