Changes on User model