Fix user model dependencies