Added support for non-3d transforms