updated models and migrations