Added puppet support