Adding support for NGZ