Update to BPEv3 API