Significant revisions to ncml module.