Merging upstream schema
Adding sitemap