Added puppet agent support