Updates for Bamboo 4.4

Not sure how to make this compatible with pre-4.4 but it should work like this for all versions going forward.