Big updates to the model schema