Added Cauldron support.. Kind of.