Simplified the schema