DATAES-12 added support for GeoPoint