Fixed references to User model