Changes in our model and schema
merging