changes to usermodel and migration