Update to support Cauldron 1.7