Updates to user model and controller