Adding NVM support