Plugin changes for BBY Adaption