Updated implementation to support geo.latlng