Add user location and team to user model