Update to schema
Fixing merge conflicts