Revised user model