Improved puppet manifests