Updated LocationService