Fix models & add migration
Add missing model changes