updated schema
merged schema