Add multi PBC version support