Added NMA support