Added support for NGD Build