fix migration and update User model