Added Puppet Support