Improved Origin / Puppet support