Added support for transformed geometries