Added nvm support