Updated site generation