Added user location support