[Sitemap]: preparing upgrade and improving schema