Added user location tracking