Updated site.pp using new classes