Added puppet related stuff.