Improved Bamboo integration