Made changes to support bbb 2.5