Removed dependence on .bbe class