Added NBP Adapter