Updated models and migrations
Merged