Improved error handling
Add NBD model