Enhance puppet support