Update for Catbox 2.1+ APIs