Updates for hub and nvm