Updated references to user model