user model improvements