Updated user model and user controller