Fix for user locations, add user location modules