Added more to geolocation