many changes to model and migratations