Updated for BC 6.0.x compatibility