Refactor NVD and NVDXMPP