Some changes for generation of site.pp