BCM OPI improvements