Switch to DataValue Geo 1.x