Modified User model