Improved Origin/Puppet support