updated with models and migrations