Updated to resolve issues in sitemap and bindings