* Added more BNS Plugin Integration (BPI) adjustments