Refactor sitemap