Updated everything to use UserInfo instead of User