Sitemap rework