Further updates to the ncml module.