Added support for NCrunch