updated user model to include associations