Updated puppet reporting (again)