added ndm support.