Changes to the User model and mapping