Added support for z-cylinders