Added support for using z/