Added Collections classes and refactor Sitemap classes