BDI protector and some changes to container