Added geolocation support