added NVM support