Upped version with GIS features