Added BMBC specific changes