Add nvm support