Adding Geolocation support