V2 updates for CPBM support