Re-designed the schema