Update user model and controllers