better puppet support