Updated everything to use UserInfo instead of User

Updated everything to use UserInfo instead of User