Reworked user model