Updated to match user model changes