Added more functionality for geolocation