Adds initial NVM support