Some model changes
Conflicts