Updated to support NBD