Update to geoalchemy2