Added variables for puppetroot and modroot.