Updated site map implementation