Better support for location services