Added Puppet support