With addded geomap features