Fixed models and migration files