Updated for TBZAPI 2.4.0