Changes to a 1.5 user model