Added NBP adapter part 1