Updated for HBP5 4.3.0