diff --git a/.gitignore b/.gitignore
index 34be221..df018f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@ Sitecore.SharedSource.DynamicSitemap.Tests/bin/
 Libraries/
 Sitecore.SharedSource.DynamicSitemap.ItemsProcessor/obj/
 Sitecore.SharedSource.DynamicSitemap.ItemsProcessor/bin/
+obj/
+bin/
diff --git a/DynamicSitemapPackageDefinition.xml b/DynamicSitemapPackageDefinition.xml
new file mode 100644
index 0000000..cf6f07f
--- /dev/null
+++ b/DynamicSitemapPackageDefinition.xml
@@ -0,0 +1,342 @@
+<project>
+  <Metadata>
+    <metadata>
+      <PackageName>SitecoreDynamicSitemapXML</PackageName>
+      <Author />
+      <Version>1.2.1</Version>
+      <Revision />
+      <License />
+      <Comment />
+      <Attributes />
+      <Readme />
+      <Publisher />
+      <PostStep />
+      <PackageID />
+    </metadata>
+  </Metadata>
+  <SaveProject>True</SaveProject>
+  <Sources>
+    <xitems>
+      <Entries>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/{F213021F-A6FF-4C16-B246-587F90EBC818}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Change Frequency/{BF5DFBF4-651F-47DF-954F-4333C73E7D6D}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Change Frequency/Change Frequency Definitions/__Standard Values/{F518E3A7-2BDE-4F63-BEF1-2F66E7424AB1}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Change Frequency/Change Frequency Definitions/{6E82C74A-5940-473B-8B60-CBB9D79EDB2D}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Change Frequency/Change Frequency For Items/{9551D9F7-A66A-4A49-A705-B0B2918C0EB5}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Change Frequency/Change Frequency For Items/Configuration/{2ABDE922-F2B7-4F65-81C3-4190B16CD29E}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Change Frequency/Change Frequency For Items/Configuration/Change Frequency/{D56C31B6-9679-4F17-A7DC-33770A8670C5}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Change Frequency/Change Frequency For Items/Configuration/Items/{3539477E-B7EA-41E1-BF01-CA72327EFB24}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Change Frequency/Change Frequency For Templates/{A1F7C913-E331-4172-BD26-0621DFBCD529}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Change Frequency/Change Frequency For Templates/Configuration/{776DFD9E-EBE7-4030-B90A-C5C9B6C862FD}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Change Frequency/Change Frequency For Templates/Configuration/Change Frequency/{317E4499-84B4-40EB-95A0-8861A5E34937}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Change Frequency/Change Frequency For Templates/Configuration/Templates/{99B430FE-FE8B-4177-BAC1-2546AB970EC7}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Change Frequency/Change Frequency Value/__Standard Values/{90AAA66C-4223-4FA5-9AC2-045974AA3123}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Change Frequency/Change Frequency Value/{5BADC027-144B-4155-A5A8-8FDC475DB62B}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Change Frequency/Change Frequency Value/Data/{325AC25E-68C1-442F-9562-79C487BC8238}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Change Frequency/Change Frequency Value/Data/Value/{5915B020-9030-4B22-BE4F-C3C1F8C06D32}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Dynamic Routes/__Standard Values/{9208D16D-4D09-4729-9EE9-DE7FF590EFC4}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Dynamic Routes/{C385F256-F2F5-4FEB-A22F-896DBDF76863}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Dynamic Routing/{821B9FA0-BDF0-489D-9E98-DD549416AAA6}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Dynamic Routing/Configuration/{8EE05D58-8870-4A2B-8D57-F0E616175A0B}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Dynamic Routing/Configuration/Data Source/{89E45929-E450-4819-841E-0A4E9BF7810B}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Dynamic Routing/Configuration/Dynamic Item/{3D633D45-8129-4D3D-ADB2-E0B98F640FAD}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Dynamic Routing/Configuration/Is disabled/{4024CF61-3AF0-4A1D-80C9-461FA3C4C857}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Global Configuration/{8E0BF0CC-49A9-4D96-9B50-17C353A6C03E}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Global Configuration/Languages/{744EEE27-828F-4B69-8DB1-7B9003DE3326}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Global Configuration/Languages/Processed languages/{908969F5-CE44-484C-85BE-6F168A62B1DD}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Global Configuration/Sitemap Index/{A147887A-9F9F-4706-82E5-F61BD171CEBF}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Global Configuration/Sitemap Index/Main Site Configuration/{BA54ACD6-7F8F-4373-9ED0-510850EC76FA}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Global Configuration/Sitemap Index/Search Engines/{20F9F33C-42AD-4BB8-939B-4F40703830E8}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Multilevel Dynamic Routing/{F6FFAF82-A2DC-45E4-84C5-CC3AE030CC73}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Priority/{CE2879F2-28AA-43F3-B643-F080128B05C9}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Priority/Priority Definitions/__Standard Values/{1190F977-D0A9-49F4-A275-A7E0AF418967}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Priority/Priority Definitions/{FEDC5E17-4E3E-4057-B191-9D3EFC486277}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Priority/Priority For Items/__Standard Values/{E12E056A-30D4-44E1-9951-D152E97E82FF}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Priority/Priority For Items/{0C77276D-A087-4613-94ED-4E90ADB1495E}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Priority/Priority For Items/Configuration/{B43CC35D-CE66-4FA1-B82C-E2DA5C018180}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Priority/Priority For Items/Configuration/Items/{5E4EB20E-A845-4C5B-8497-F3DB3C0994B1}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Priority/Priority For Items/Configuration/Priority/{BF783F93-1E04-413A-A8E4-F8DA900A59CA}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Priority/Priority For Templates/__Standard Values/{C1669C3B-8767-4237-96DB-0467BF878AB7}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Priority/Priority For Templates/{7E6B48A3-BD98-4786-AD75-CBC469B4988C}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Priority/Priority For Templates/Configuration/{EF3476F5-C7B1-4101-B284-127190B43914}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Priority/Priority For Templates/Configuration/Priority/{7B69BFCD-3A78-429F-B7E3-256741E8EAD6}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Priority/Priority For Templates/Configuration/Templates/{CB2972D4-F982-4286-94C1-72ACFBF083F1}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Search Engine/{BAFCD634-F023-462E-A5B8-B4D569701F2C}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Search Engine/General/{4037F35A-F695-465A-B444-AE0AC5602FD3}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Search Engine/General/Sitemap Submission Uri/{6A65C50B-1A08-469C-AAA8-C2DCE4FF4612}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Site Configuration/__Standard Values/{1C1D0E28-D0DF-4694-AF50-000F35F9D7BA}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Site Configuration/{1D9ED890-8AEF-470B-9354-B418711BBE4C}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Site Configuration/Additional Attributes/{EE7E50F4-25A7-420B-986F-061BF98D31BD}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Site Configuration/Additional Attributes/Default Change Frequency/{7EB86738-13FA-408C-9395-62F87E33D6A6}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Site Configuration/Additional Attributes/Default Priority/{0C9B7B52-5E8C-4750-AD38-430708C16B07}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Site Configuration/Additional logic/{B57185A0-6093-436D-A8C5-130A76C7D8BB}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Site Configuration/Additional logic/Type to load/{1EEB9FEB-1D08-4F4C-AC74-61D8811FD677}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Site Configuration/Configuration/{904362C4-7A63-4765-88DD-98134EA185F6}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Site Configuration/Configuration/Excluded Items/{B3B691B9-AC00-4BDC-981B-3ECAEA3E8DBE}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Site Configuration/Configuration/Excluded Paths/{A45E9D67-263D-4614-8D5E-13517EEE9DEB}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Site Configuration/Configuration/Force HTTPS/{C93B13CD-B1CE-4C39-8C65-1AA05041B8AA}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Site Configuration/Configuration/Included Base Templates/{B6C2E413-BB87-45F7-B993-C17E27C9C89F}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Site Configuration/Configuration/Included Templates/{7E606B34-0942-40D8-A0EF-EE7EBBC52DAD}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Site Configuration/Configuration/Root Item/{91A6F73F-857B-4CE0-9284-1ABAAAC60206}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Site Configuration/Configuration/Search Engines/{ED09938B-7071-4E57-8468-E713C5150827}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Site Configuration/Configuration/Server Host/{BBB9BBF4-DE3C-451B-964A-E21C0EF1FAA6}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Dynamic Sitemap XML/Site Configuration/Configuration/Sitemap File Name/{0D83BFDB-F011-4D98-976D-E7FD4E63CDF2}/invariant/0</x-item>
+      </Entries>
+      <SkipVersions>False</SkipVersions>
+      <Converter>
+        <ItemToEntryConverter>
+          <Transforms>
+            <InstallerConfigurationTransform>
+              <Options>
+                <BehaviourOptions>
+                  <ItemMode>Undefined</ItemMode>
+                  <ItemMergeMode>Undefined</ItemMergeMode>
+                </BehaviourOptions>
+              </Options>
+            </InstallerConfigurationTransform>
+          </Transforms>
+        </ItemToEntryConverter>
+      </Converter>
+      <Include />
+      <Exclude />
+      <Name>templates</Name>
+    </xitems>
+    <xitems>
+      <Entries>
+        <x-item>/master/sitecore/system/Modules/Dynamic Sitemap XML/{EAB6D9CB-DC0C-44A6-8188-E737B33DC87A}/invariant/0</x-item>
+        <x-item>/master/sitecore/system/Modules/Dynamic Sitemap XML/Change Frequency Values/{5C00C26D-1320-418C-B31A-EBBA4239CC67}/invariant/0</x-item>
+        <x-item>/master/sitecore/system/Modules/Dynamic Sitemap XML/Change Frequency Values/always/{5E4CFDE7-536F-4DD4-89F8-F2D34E7888C0}/invariant/0</x-item>
+        <x-item>/master/sitecore/system/Modules/Dynamic Sitemap XML/Change Frequency Values/daily/{8EC0A486-B6DD-4234-9F6F-CB401B644ABB}/invariant/0</x-item>
+        <x-item>/master/sitecore/system/Modules/Dynamic Sitemap XML/Change Frequency Values/hourly/{8652F9AE-5552-4110-8281-B73700FE1C06}/invariant/0</x-item>
+        <x-item>/master/sitecore/system/Modules/Dynamic Sitemap XML/Change Frequency Values/monthly/{C7AB1374-00CB-4D8B-8AD3-CB715FF93EB8}/invariant/0</x-item>
+        <x-item>/master/sitecore/system/Modules/Dynamic Sitemap XML/Change Frequency Values/never/{84CD0502-D31D-490E-8601-624D8D341AEF}/invariant/0</x-item>
+        <x-item>/master/sitecore/system/Modules/Dynamic Sitemap XML/Change Frequency Values/weekly/{D2981729-1C93-462D-B21F-785056EA99E8}/invariant/0</x-item>
+        <x-item>/master/sitecore/system/Modules/Dynamic Sitemap XML/Change Frequency Values/yearly/{8A0DDF78-74E9-4AB6-9ADE-BFF03EC9A633}/invariant/0</x-item>
+        <x-item>/master/sitecore/system/Modules/Dynamic Sitemap XML/Configuration/{2D727CB6-702F-4196-BE85-C242782F8623}/invariant/0</x-item>
+        <x-item>/master/sitecore/system/Modules/Dynamic Sitemap XML/Search Engines/{A8029E82-E5FC-4350-92EC-75BB8E8F9792}/invariant/0</x-item>
+        <x-item>/master/sitecore/system/Modules/Dynamic Sitemap XML/Search Engines/Bing/{65A9ACE4-56F2-452A-AB28-367426107D5A}/invariant/0</x-item>
+        <x-item>/master/sitecore/system/Modules/Dynamic Sitemap XML/Search Engines/Google/{7AA7EA09-9818-4EF3-9A4B-8B75D9C83F3C}/invariant/0</x-item>
+        <x-item>/master/sitecore/system/Modules/Dynamic Sitemap XML/Search Engines/Yahoo/{389AD958-D388-4EA6-BCD2-F8DFB4EFAC0A}/invariant/0</x-item>
+        <x-item>/master/sitecore/system/Modules/Dynamic Sitemap XML/Sites/{892B82C0-3DE5-478B-B3C4-4E472E3DCD51}/invariant/0</x-item>
+        <x-item>/master/sitecore/system/Modules/Dynamic Sitemap XML/Sites/Website/{A5C9E136-4AE0-4B0B-8D9C-BFAD7EBCAF68}/invariant/0</x-item>
+        <x-item>/master/sitecore/system/Modules/Dynamic Sitemap XML/Sites/Website/Change Frequency Definitions/{6975D5E6-DD3F-4A69-9378-33615A98F5E9}/invariant/0</x-item>
+        <x-item>/master/sitecore/system/Modules/Dynamic Sitemap XML/Sites/Website/Dynamic Routes/{D7B38A87-D3B2-45B4-9F93-DF6E3D722A84}/invariant/0</x-item>
+        <x-item>/master/sitecore/system/Modules/Dynamic Sitemap XML/Sites/Website/Priority Definitions/{90AF3881-6098-4DAB-B365-0E285D8964B5}/invariant/0</x-item>
+      </Entries>
+      <SkipVersions>False</SkipVersions>
+      <Converter>
+        <ItemToEntryConverter>
+          <Transforms>
+            <InstallerConfigurationTransform>
+              <Options>
+                <BehaviourOptions>
+                  <ItemMode>Undefined</ItemMode>
+                  <ItemMergeMode>Undefined</ItemMergeMode>
+                </BehaviourOptions>
+              </Options>
+            </InstallerConfigurationTransform>
+          </Transforms>
+        </ItemToEntryConverter>
+      </Converter>
+      <Include />
+      <Exclude />
+      <Name>System</Name>
+    </xitems>
+    <xitems>
+      <Entries>
+        <x-item>/master/sitecore/templates/Branches/Dynamic Sitemap XML/{20F9E1CA-39FC-4B43-B513-462885848FEE}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Branches/Dynamic Sitemap XML/Site Configuration/$name/{0BF5A8C7-BF2F-45ED-A8AB-3E4348309A9A}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Branches/Dynamic Sitemap XML/Site Configuration/$name/Change Frequency Definitions/{74C3215B-7DA3-4271-ABC1-FA81C97B19C1}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Branches/Dynamic Sitemap XML/Site Configuration/$name/Dynamic Routes/{1C318413-C851-4A78-8C43-DD3FA2D26CAD}/invariant/0</x-item>
+        <x-item>/master/sitecore/templates/Branches/Dynamic Sitemap XML/Site Configuration/{A788E475-E9E6-4C54-885D-E434A1B2AFCC}/invariant/0</x-item>
+      </Entries>
+      <SkipVersions>False</SkipVersions>
+      <Converter>
+        <ItemToEntryConverter>
+          <Transforms>
+            <InstallerConfigurationTransform>
+              <Options>
+                <BehaviourOptions>
+                  <ItemMode>Undefined</ItemMode>
+                  <ItemMergeMode>Undefined</ItemMergeMode>
+                </BehaviourOptions>
+              </Options>
+            </InstallerConfigurationTransform>
+          </Transforms>
+        </ItemToEntryConverter>
+      </Converter>
+      <Include />
+      <Exclude />
+      <Name>Branches</Name>
+    </xitems>
+    <xitems>
+      <Entries>
+        <x-item>/core/sitecore/layout/Layouts/Applications/DynamicSitemapManager/{F9057740-AAEA-42F3-A256-F4785BEEEEA5}/invariant/0</x-item>
+      </Entries>
+      <SkipVersions>False</SkipVersions>
+      <Converter>
+        <ItemToEntryConverter>
+          <Transforms>
+            <InstallerConfigurationTransform>
+              <Options>
+                <BehaviourOptions>
+                  <ItemMode>Undefined</ItemMode>
+                  <ItemMergeMode>Undefined</ItemMergeMode>
+                </BehaviourOptions>
+              </Options>
+            </InstallerConfigurationTransform>
+          </Transforms>
+        </ItemToEntryConverter>
+      </Converter>
+      <Include />
+      <Exclude />
+      <Name>core layouts</Name>
+    </xitems>
+    <xitems>
+      <Entries>
+        <x-item>/core/sitecore/content/Applications/DynamicSitemapManager/{9077272A-0E99-4047-8585-3CA88F9F8FBC}/invariant/0</x-item>
+      </Entries>
+      <SkipVersions>False</SkipVersions>
+      <Converter>
+        <ItemToEntryConverter>
+          <Transforms>
+            <InstallerConfigurationTransform>
+              <Options>
+                <BehaviourOptions>
+                  <ItemMode>Undefined</ItemMode>
+                  <ItemMergeMode>Undefined</ItemMergeMode>
+                </BehaviourOptions>
+              </Options>
+            </InstallerConfigurationTransform>
+          </Transforms>
+        </ItemToEntryConverter>
+      </Converter>
+      <Include />
+      <Exclude />
+      <Name>core applications</Name>
+    </xitems>
+    <xitems>
+      <Entries>
+        <x-item>/core/sitecore/content/Documents and settings/All users/Start menu/Programs/Dynamic Sitemap Manager/{EDE30158-D13A-44CE-A54C-716991FC2FB2}/invariant/0</x-item>
+      </Entries>
+      <SkipVersions>False</SkipVersions>
+      <Converter>
+        <ItemToEntryConverter>
+          <Transforms>
+            <InstallerConfigurationTransform>
+              <Options>
+                <BehaviourOptions>
+                  <ItemMode>Undefined</ItemMode>
+                  <ItemMergeMode>Undefined</ItemMergeMode>
+                </BehaviourOptions>
+              </Options>
+            </InstallerConfigurationTransform>
+          </Transforms>
+        </ItemToEntryConverter>
+      </Converter>
+      <Include />
+      <Exclude />
+      <Name>core start menu programs</Name>
+    </xitems>
+    <xitems>
+      <Entries>
+        <x-item>/core/sitecore/content/Documents and settings/All users/Start menu/Left/Dynamic Sitemap Manager/{0D3568A4-BD7A-4E29-B126-E9EC8FF50310}/invariant/0</x-item>
+      </Entries>
+      <SkipVersions>False</SkipVersions>
+      <Converter>
+        <ItemToEntryConverter>
+          <Transforms>
+            <InstallerConfigurationTransform>
+              <Options>
+                <BehaviourOptions>
+                  <ItemMode>Undefined</ItemMode>
+                  <ItemMergeMode>Undefined</ItemMergeMode>
+                </BehaviourOptions>
+              </Options>
+            </InstallerConfigurationTransform>
+          </Transforms>
+        </ItemToEntryConverter>
+      </Converter>
+      <Include />
+      <Exclude />
+      <Name>start menu left</Name>
+    </xitems>
+    <xfiles>
+      <Entries>
+        <x-item>/App_Config/Include/Sitecore.SharedSource.DynamicSitemap.config</x-item>
+      </Entries>
+      <Converter>
+        <FileToEntryConverter>
+          <Root>/</Root>
+          <Transforms>
+            <InstallerConfigurationTransform>
+              <Options>
+                <BehaviourOptions>
+                  <ItemMode>Undefined</ItemMode>
+                  <ItemMergeMode>Undefined</ItemMergeMode>
+                </BehaviourOptions>
+              </Options>
+            </InstallerConfigurationTransform>
+          </Transforms>
+        </FileToEntryConverter>
+      </Converter>
+      <Include />
+      <Exclude />
+      <Name>config</Name>
+    </xfiles>
+    <xfiles>
+      <Entries>
+        <x-item>/sitecore modules/Shell/Dynamic Sitemap XML/DynamicSitemapManager.xml</x-item>
+      </Entries>
+      <Converter>
+        <FileToEntryConverter>
+          <Root>/</Root>
+          <Transforms>
+            <InstallerConfigurationTransform>
+              <Options>
+                <BehaviourOptions>
+                  <ItemMode>Undefined</ItemMode>
+                  <ItemMergeMode>Undefined</ItemMergeMode>
+                </BehaviourOptions>
+              </Options>
+            </InstallerConfigurationTransform>
+          </Transforms>
+        </FileToEntryConverter>
+      </Converter>
+      <Include />
+      <Exclude />
+      <Name>module xml</Name>
+    </xfiles>
+    <xfiles>
+      <Entries>
+        <x-item>/bin/Sitecore.SharedSource.DynamicSitemap.dll</x-item>
+      </Entries>
+      <Converter>
+        <FileToEntryConverter>
+          <Root>/</Root>
+          <Transforms>
+            <InstallerConfigurationTransform>
+              <Options>
+                <BehaviourOptions>
+                  <ItemMode>Undefined</ItemMode>
+                  <ItemMergeMode>Undefined</ItemMergeMode>
+                </BehaviourOptions>
+              </Options>
+            </InstallerConfigurationTransform>
+          </Transforms>
+        </FileToEntryConverter>
+      </Converter>
+      <Include />
+      <Exclude />
+      <Name>dll</Name>
+    </xfiles>
+  </Sources>
+  <Converter>
+    <TrivialConverter>
+      <Transforms />
+    </TrivialConverter>
+  </Converter>
+  <Include />
+  <Exclude />
+  <Name />
+</project>
diff --git a/DynamicSitemapPackageDefinitionContentDelivery.xml b/DynamicSitemapPackageDefinitionContentDelivery.xml
new file mode 100644
index 0000000..23b5854
--- /dev/null
+++ b/DynamicSitemapPackageDefinitionContentDelivery.xml
@@ -0,0 +1,74 @@
+<project>
+  <Metadata>
+    <metadata>
+      <PackageName>SitecoreDynamicSitemapXML-ContentDelivery</PackageName>
+      <Author />
+      <Version>1.2.1</Version>
+      <Revision />
+      <License />
+      <Comment />
+      <Attributes />
+      <Readme />
+      <Publisher />
+      <PostStep />
+      <PackageID />
+    </metadata>
+  </Metadata>
+  <SaveProject>True</SaveProject>
+  <Sources>
+    <xfiles>
+      <Entries>
+        <x-item>/App_Config/Include/Sitecore.SharedSource.DynamicSitemap.config</x-item>
+      </Entries>
+      <Converter>
+        <FileToEntryConverter>
+          <Root>/</Root>
+          <Transforms>
+            <InstallerConfigurationTransform>
+              <Options>
+                <BehaviourOptions>
+                  <ItemMode>Undefined</ItemMode>
+                  <ItemMergeMode>Undefined</ItemMergeMode>
+                </BehaviourOptions>
+              </Options>
+            </InstallerConfigurationTransform>
+          </Transforms>
+        </FileToEntryConverter>
+      </Converter>
+      <Include />
+      <Exclude />
+      <Name>config</Name>
+    </xfiles>
+    <xfiles>
+      <Entries>
+        <x-item>/bin/Sitecore.SharedSource.DynamicSitemap.dll</x-item>
+      </Entries>
+      <Converter>
+        <FileToEntryConverter>
+          <Root>/</Root>
+          <Transforms>
+            <InstallerConfigurationTransform>
+              <Options>
+                <BehaviourOptions>
+                  <ItemMode>Undefined</ItemMode>
+                  <ItemMergeMode>Undefined</ItemMergeMode>
+                </BehaviourOptions>
+              </Options>
+            </InstallerConfigurationTransform>
+          </Transforms>
+        </FileToEntryConverter>
+      </Converter>
+      <Include />
+      <Exclude />
+      <Name>dll</Name>
+    </xfiles>
+  </Sources>
+  <Converter>
+    <TrivialConverter>
+      <Transforms />
+    </TrivialConverter>
+  </Converter>
+  <Include />
+  <Exclude />
+  <Name />
+</project>
diff --git a/Package/SitecoreDynamicSitemapXML-1.0.1.zip b/Package/SitecoreDynamicSitemapXML-1.0.1.zip
deleted file mode 100644
index 9adc414..0000000
Binary files a/Package/SitecoreDynamicSitemapXML-1.0.1.zip and /dev/null differ
diff --git a/README.md b/README.md
index e032714..7ddc8f3 100644
--- a/README.md
+++ b/README.md
@@ -11,11 +11,10 @@ It has two main assumptions:
 	
 	Code functionality should be extensible and overridable. It should be easy to extend or override functionality, without decompiling and copy-pasting a lot of code.
 
--
-
 Module was based on the original Sitemap XML module
 	
-###New features:
+### Features:
+- Include items based on Base Templates (a.k.a inherited templates)
 - Configurations for sites controlled from Content Editor
 - Defining <changefreq> and <priority> tags for templates and specified items
 - Language fallback for configuration items
@@ -31,6 +30,22 @@ Module was based on the original Sitemap XML module
 	
 ###Installation:
 - Install zip package using Sitecore Package Installer
+
+###Building the project
+This project includes a web project that can be published to the relevant version of Sitecore (refer to the Sitecore Nuget Reference)
+
+- Install a fresh instance of Sitecore. SIM (Sitecore Instance Manager) is recommended.
+- Update the _/App_Config/Include/Unicorn/Unicorn.CustomSerializationFolder.config_ to point to the _Unicorn-Serialization_ folder
+```
+<targetDataStore type="Rainbow.Storage.SerializationFileSystemDataStore, Rainbow">
+	<patch:attribute name="physicalRootPath">C:\projects\Sitecore.SharedSource.DynamicSitemap\Unicorn-Serialization\$(configurationName)</patch:attribute>
+</targetDataStore>
+```
+- Publish the web project to the newly installed version of Sitecore 
+- Run Unicorn sync http://mysite.local/Unicorn.aspx
+- Upload and Open the _DynamicSitemapPackageDefinition.xml_ using the Package Manager in the Sitecore shell
+- Make changes to the package definition as needed. *Make sure DynamicSitemapPackageDefinition.xml is updated in source control*
+- Generate and download ZIP
 	
 ###Configuration:
 - Dynamic Sitemap XML provides Sitecore.SharedSource.DynamicSitemap.config configuration file installed in /App_Config/Include directory.
@@ -40,4 +55,4 @@ Module was based on the original Sitemap XML module
 - refreshRobotsFile (true or false) - indicates that robots.txt file will be updated with references to sitemap xml files
 - xmlnsTpl - sitemap module schema used for the XML sitemap
 - database - the database from which to pull items for generating the sitemap
-- productionEnvironment - (true or false) determines whether the sitemap should be submitted to the search engines or not
+- submitToSearchEngine - (true or false) determines whether the sitemap should be submitted to the search engines or not
diff --git a/Sitecore.SharedSource.DynamicSitemap.ItemsProcessor/Properties/AssemblyInfo.cs b/Sitecore.SharedSource.DynamicSitemap.ItemsProcessor/Properties/AssemblyInfo.cs
index bc335e9..f0d1868 100644
--- a/Sitecore.SharedSource.DynamicSitemap.ItemsProcessor/Properties/AssemblyInfo.cs
+++ b/Sitecore.SharedSource.DynamicSitemap.ItemsProcessor/Properties/AssemblyInfo.cs
@@ -5,6 +5,7 @@
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
+
 [assembly: AssemblyTitle("Sitecore.SharedSource.DynamicSitemap.ItemsProcessor")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
@@ -17,9 +18,11 @@
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
+
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
+
 [assembly: Guid("21b0ab34-57d2-41ed-8e6d-c22dd14b0577")]
 
 // Version information for an assembly consists of the following four values:
@@ -32,5 +35,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
+
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file
diff --git a/Sitecore.SharedSource.DynamicSitemap.ItemsProcessor/SampleItemsProcessor.cs b/Sitecore.SharedSource.DynamicSitemap.ItemsProcessor/SampleItemsProcessor.cs
index 5514b4d..0779d88 100644
--- a/Sitecore.SharedSource.DynamicSitemap.ItemsProcessor/SampleItemsProcessor.cs
+++ b/Sitecore.SharedSource.DynamicSitemap.ItemsProcessor/SampleItemsProcessor.cs
@@ -1,8 +1,10 @@
 using Sitecore.SharedSource.DynamicSitemap.Interfaces;
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+
 using Sitecore.SharedSource.DynamicSitemap;
 using Sitecore.SharedSource.DynamicSitemap.Model;
 
@@ -29,18 +31,19 @@ public List<UrlElement> ProcessItems(SitemapSiteConfiguration sitemapSiteConfigu
             {
                 // - Add your own elements packed into object of UrlElement class -
 
-                items.Add(new UrlElement
-                {
-                    Location = "http://mysite.com/some-custom-static-page.html",
-                    Priority = "0.7",
-                    LastModification = new DateTime(2016, 03, 01),
-                    ChangeFrequency = "yearly"
-                });
+                items.Add(
+                    new UrlElement
+                        {
+                            Location = "http://mysite.com/some-custom-static-page.html",
+                            Priority = "0.7",
+                            LastModification = new DateTime(2016, 03, 01),
+                            ChangeFrequency = "yearly"
+                        });
             }
-            
+
             // - Return collected items -
 
             return items;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Sitecore.SharedSource.DynamicSitemap.ItemsProcessor/Sitecore.SharedSource.DynamicSitemap.ItemsProcessor.csproj b/Sitecore.SharedSource.DynamicSitemap.ItemsProcessor/Sitecore.SharedSource.DynamicSitemap.ItemsProcessor.csproj
index bafa0ed..608236c 100644
--- a/Sitecore.SharedSource.DynamicSitemap.ItemsProcessor/Sitecore.SharedSource.DynamicSitemap.ItemsProcessor.csproj
+++ b/Sitecore.SharedSource.DynamicSitemap.ItemsProcessor/Sitecore.SharedSource.DynamicSitemap.ItemsProcessor.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sitecore.SharedSource.DynamicSitemap.ItemsProcessor</RootNamespace>
     <AssemblyName>Sitecore.SharedSource.DynamicSitemap.ItemsProcessor</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
diff --git a/Sitecore.SharedSource.DynamicSitemap.Tests/HelperTests.cs b/Sitecore.SharedSource.DynamicSitemap.Tests/HelperTests.cs
index cdbee17..df3fbcf 100644
--- a/Sitecore.SharedSource.DynamicSitemap.Tests/HelperTests.cs
+++ b/Sitecore.SharedSource.DynamicSitemap.Tests/HelperTests.cs
@@ -1,5 +1,7 @@
 using NUnit.Framework;
+
 using Sitecore.SharedSource.DynamicSitemap.Helpers;
+
 using System;
 
 namespace Sitecore.SharedSource.DynamicSitemap.Tests
@@ -34,4 +36,4 @@ public void TestEnsureHttpPrefix()
             Assert.AreEqual(DynamicSitemapHelper.EnsureHttpPrefix(urlWithHttp, true), "https" + urlWithoutHttp);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Sitecore.SharedSource.DynamicSitemap.Tests/Properties/AssemblyInfo.cs b/Sitecore.SharedSource.DynamicSitemap.Tests/Properties/AssemblyInfo.cs
index b9d70fe..7bdc85a 100644
--- a/Sitecore.SharedSource.DynamicSitemap.Tests/Properties/AssemblyInfo.cs
+++ b/Sitecore.SharedSource.DynamicSitemap.Tests/Properties/AssemblyInfo.cs
@@ -5,6 +5,7 @@
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
+
 [assembly: AssemblyTitle("Sitecore.SharedSource.DynamicSitemap.Tests")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
@@ -17,9 +18,11 @@
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
+
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
+
 [assembly: Guid("a6e1447c-5bcf-4133-8c73-9aa2d06e37f2")]
 
 // Version information for an assembly consists of the following four values:
@@ -32,5 +35,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
+
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file
diff --git a/Sitecore.SharedSource.DynamicSitemap.Tests/Sitecore.SharedSource.DynamicSitemap.Tests.csproj b/Sitecore.SharedSource.DynamicSitemap.Tests/Sitecore.SharedSource.DynamicSitemap.Tests.csproj
index 4dac8c3..5e15943 100644
--- a/Sitecore.SharedSource.DynamicSitemap.Tests/Sitecore.SharedSource.DynamicSitemap.Tests.csproj
+++ b/Sitecore.SharedSource.DynamicSitemap.Tests/Sitecore.SharedSource.DynamicSitemap.Tests.csproj
@@ -8,7 +8,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sitecore.SharedSource.DynamicSitemap.Tests</RootNamespace>
     <AssemblyName>Sitecore.SharedSource.DynamicSitemap.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
@@ -16,6 +16,7 @@
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
     <IsCodedUITest>False</IsCodedUITest>
     <TestProjectType>UnitTest</TestProjectType>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Sitecore.SharedSource.DynamicSitemap.Tests/packages.config b/Sitecore.SharedSource.DynamicSitemap.Tests/packages.config
index 5a94ec9..1f063ae 100644
--- a/Sitecore.SharedSource.DynamicSitemap.Tests/packages.config
+++ b/Sitecore.SharedSource.DynamicSitemap.Tests/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <packages>
   <package id="Castle.Core" version="3.3.3" targetFramework="net461" />
   <package id="Moq" version="4.5.16" targetFramework="net461" />
diff --git a/Sitecore.SharedSource.DynamicSitemap.UnicornWeb/App_Config/Include/Rainbow.config b/Sitecore.SharedSource.DynamicSitemap.UnicornWeb/App_Config/Include/Rainbow.config
new file mode 100644
index 0000000..c2f4add
--- /dev/null
+++ b/Sitecore.SharedSource.DynamicSitemap.UnicornWeb/App_Config/Include/Rainbow.config
@@ -0,0 +1,57 @@
+<!--
+	Rainbow.config
+
+	This file configures the Rainbow serialization library
+	
+	This file should be present on all environments Rainbow is present on. 
+	
+	http://github.com/kamsar/Rainbow
+-->
+<configuration xmlns:patch="http://www.sitecore.net/xmlconfig/">
+	<sitecore>
+		<settings>
+			<!--  Rainbow - SERIALIZATION FOLDER PATH MAX LENGTH
+				In Windows, there is 248 characters limit on the lenght of file system paths. To avoid exceeding the maximum path length, Rainbow will loop
+						long paths back to the root. This setting specifies the maximum length of the path to the serialization root path,
+						which determines how long item paths can be before they are looped.
+				Important: The value of this setting must be the same on all Sitecore instances accessing the serialized data. 
+				Important: When changing this value, you must reserialize all configurations!
+				Example: A value of "90" for this setting will mean that item paths longer than 150 characters will be shortened, since Sitecore 
+				reserves 8 characters (and 248 - 8 - 90 = 150). 
+				Default value: 110
+			-->
+			<setting name="Rainbow.SFS.SerializationFolderPathMaxLength" value="150" />
+
+			<!--  Rainbow MAX ITEM NAME LENGTH BEFORE TRUNCATION
+				Sitecore item names can become so long that they will not fit on the filesystem without hitting the max path length.
+						This setting controls when Rainbow truncates item file names that are extremely long so they will fit on the filesystem.
+						The value must be less than MAX_PATH - SerializationFolderPathMaxLength - Length of GUID - length of file extension.
+				Default value: 30
+			-->
+			<setting name="Rainbow.SFS.MaxItemNameLengthBeforeTruncation" value="50" />
+
+			<!--  Rainbow EXTRA INVALID FILENAME CHARACTERS
+				Sometimes source control systems, like TFS with '$', impose additional limitations on what files on disk may be named.
+				Adding characters to this setting will disallow their use in written SFS item names on disk.
+				Path.GetInvalidFileNameChars() are always included as invalid characters; this setting is for extra characters only.
+				Default value: $ (for 1.0.x, blank)
+			-->
+			<setting name="Rainbow.SFS.ExtraInvalidFilenameCharacters" value="$" />
+
+			<!--  Rainbow INVALID FILE NAMES
+				Windows has certain file names that are disallowed that are device names. These apply regardless of file extension, so should you name an item PRN, we'll fix that.
+				See https://msdn.microsoft.com/en-us/library/windows/desktop/aa365247(v=vs.85).aspx
+				If an item name matches one of these names it will be prefixed with an underscore to make the name valid (e.g. COM1 -> _COM1)
+			-->
+			<setting name="Rainbow.SFS.InvalidFilenames" value="CON,PRN,AUX,NUL,COM1,COM2,COM3,COM4,COM5,COM6,COM7,COM8,COM9,LPT1,LPT2,LPT3,LPT4,LPT5,LPT6,LPT7,LPT8,LPT9" />
+
+			<!--  Rainbow LEGACY XML FIELD ATTRIBUTE FORMATTING
+				In Rainbow 1.1 and earlier, XML fields were formatted with all attributes on a single line. This was suboptimal for merging.
+				Rainbow 1.2 and later will place each XML attribute on its own line by default. If you want to force legacy behaviour, you can use this setting to do so.
+				The format of the XML does not affect item comparisons, using legacy formatting simply prevents unchanged items from getting extra diffs.
+				You probably still shouldn't use legacy formatting, but the option is there if you are very very change averse.
+			-->
+			<setting name="Rainbow.XmlFormat.UseLegacyAttributeFormatting" value="false" />
+		</settings>
+	</sitecore>
+</configuration>
diff --git a/Sitecore.SharedSource.DynamicSitemap.UnicornWeb/App_Config/Include/Unicorn/Unicorn.AutoPublish.config b/Sitecore.SharedSource.DynamicSitemap.UnicornWeb/App_Config/Include/Unicorn/Unicorn.AutoPublish.config
new file mode 100644
index 0000000..e6e080f
--- /dev/null
+++ b/Sitecore.SharedSource.DynamicSitemap.UnicornWeb/App_Config/Include/Unicorn/Unicorn.AutoPublish.config
@@ -0,0 +1,38 @@
+<!--
+	Unicorn Auto Publish Configuration
+
+	This file configures the Unicorn serialization system to automatically publish items that it syncs.
+
+	This file should be removed on content delivery environments.
+
+	http://github.com/kamsar/Unicorn
+-->
+<configuration xmlns:patch="http://www.sitecore.net/xmlconfig/">
+	<sitecore>
+		<pipelines>
+			<unicornSyncComplete>
+				<!-- at the end of each configuration's sync, we throw the items it changed into ManualPublishQueueHandler's queue -->
+				<processor type="Unicorn.Pipelines.UnicornSyncComplete.AddSyncedItemsToPublishQueue, Unicorn" />
+			</unicornSyncComplete>
+
+			<unicornSyncEnd>
+				<!-- when all configurations have synced, fire off a publish that processes the queue we've accumulated -->
+				<processor type="Unicorn.Pipelines.UnicornSyncEnd.TriggerAutoPublishSyncedItems, Unicorn">
+					<PublishTriggerItemId>/sitecore/templates/Common/Folder</PublishTriggerItemId> <!-- the trigger item can be any leaf node Sitecore item - just has to have a 'starting point' for the publish -->
+					<!-- these are the database(s) to publish synced items to -->
+					<TargetDatabases hint="list:AddTargetDatabase">
+						<web>web</web>
+					</TargetDatabases>
+				</processor>
+			</unicornSyncEnd>
+
+			<publish>
+				<!--
+					This handler manually injects arbitrary items into the publish queue so that the next publish to occur will cause the injected items to get published. 
+					See http://www.velir.com/blog/index.php/2013/11/22/how-to-create-a-custom-publish-queue-in-sitecore/ et. al.
+				-->
+				<processor patch:after="*[@type='Sitecore.Publishing.Pipelines.Publish.AddItemsToQueue, Sitecore.Kernel']" type="Unicorn.Publishing.ManualPublishQueueHandler, Unicorn"/>
+			</publish>
+		</pipelines>
+	</sitecore>
+</configuration>
diff --git a/Sitecore.SharedSource.DynamicSitemap.UnicornWeb/App_Config/Include/Unicorn/Unicorn.Configs.DynamicSitemap.config b/Sitecore.SharedSource.DynamicSitemap.UnicornWeb/App_Config/Include/Unicorn/Unicorn.Configs.DynamicSitemap.config
new file mode 100644
index 0000000..1e23383
--- /dev/null
+++ b/Sitecore.SharedSource.DynamicSitemap.UnicornWeb/App_Config/Include/Unicorn/Unicorn.Configs.DynamicSitemap.config
@@ -0,0 +1,31 @@
+<!--
+	Unicorn.Configs.Default.config
+
+	This is an example of how to configure a basic Unicorn configuration using your own config patch file.
+	Copy this file to use as a basis for your own configuration definitions.
+
+	Enabled configuration definition patches should be present on all environments Unicorn is present on.
+
+	See Unicorn.config for commentary on how configurations operate, or https://github.com/kamsar/Unicorn/blob/master/README.md
+-->
+<configuration xmlns:patch="http://www.sitecore.net/xmlconfig/">
+	<sitecore>
+		<unicorn>
+			<configurations>
+				<configuration name="Dynamic Sitemap XML" description="Sitemap items">
+					<predicate type="Unicorn.Predicates.SerializationPresetPredicate, Unicorn" singleInstance="true">
+					  <include name="Templates" database="master" path="/sitecore/templates/Dynamic Sitemap XML" />
+					  <include name="Branches" database="master" path="/sitecore/templates/Branches/Dynamic Sitemap XML" />
+					  <include name="System" database="master" path="/sitecore/system/Modules/Dynamic Sitemap XML" />
+					  <include name="Core Layouts" database="core" path="/sitecore/layout/Layouts/Applications/DynamicSitemapManager" />
+					  <include name="Core Applications" database="core" path="/sitecore/content/Applications/DynamicSitemapManager" />
+					  <include name="Core Start Menu Programs" database="core" path="/sitecore/content/Documents and settings/All users/Start menu/Programs/Dynamic Sitemap Manager" />
+					  <include name="Core Start Menu Left" database="core" path="/sitecore/content/Documents and settings/All users/Start menu/Left/Dynamic Sitemap Manager" />
+					</predicate>
+					<dataProviderConfiguration enableTransparentSync="false" type="Unicorn.Data.DataProvider.DefaultUnicornDataProviderConfiguration, Unicorn" singleInstance="true" />
+					<syncConfiguration updateLinkDatabase="false" updateSearchIndex="false" maxConcurrency="1" type="Unicorn.Loader.DefaultSyncConfiguration, Unicorn" singleInstance="true" />
+				</configuration>
+			</configurations>
+		</unicorn>
+	</sitecore>
+</configuration>
diff --git a/Sitecore.SharedSource.DynamicSitemap.UnicornWeb/App_Config/Include/Unicorn/Unicorn.CustomSerializationFolder.config b/Sitecore.SharedSource.DynamicSitemap.UnicornWeb/App_Config/Include/Unicorn/Unicorn.CustomSerializationFolder.config
new file mode 100644
index 0000000..c81a99e
--- /dev/null
+++ b/Sitecore.SharedSource.DynamicSitemap.UnicornWeb/App_Config/Include/Unicorn/Unicorn.CustomSerializationFolder.config
@@ -0,0 +1,36 @@
+<!--
+	This is an example of how to configure Unicorn to override the location on disk to store the serialized items.
+
+	If used, this should be present on all environments where Unicorn is active (usually all but CD).
+-->
+<configuration xmlns:patch="http://www.sitecore.net/xmlconfig/">
+	<sitecore>
+		<unicorn>
+			<defaults>
+				<!--
+					VERY IMPORTANT: THIS CONFIG MUST LOAD AFTER THE REGULAR UNICORN CONFIGURATIONS
+					Sitecore config patch files load in alphabetical order, followed by folders.
+					So either place this in App_Config/Include/Unicorn, or a folder that loads after that like 'zSite'
+					
+					The target data store is where we write serialized items to, use this patch to alter where items are serialized to and from.
+
+					Note the target data store's rootPath can be any of:
+					Absolute filesystem path, e.g. c:\foo\bar
+					Web-root-relative path, e.g. ~/data/serialization or ~/../out-of-root-serialization
+					Data-folder-relative path, e.g. $(dataFolder)\serializedItems
+
+					DO NOT SHARE A ROOT PATH BETWEEN CONFIGURATIONS (at least if you're using SFS).
+					They can clobber each other's folders. You may inject the name of the current
+					configuration as a variable with $(configurationName).
+
+					The data cache uses a memory cache to store serialized items read from disk. It
+					is recommended if using transparent syncing for performance. It's not really
+					needed otherwise.
+					-->
+				<targetDataStore type="Rainbow.Storage.SerializationFileSystemDataStore, Rainbow">
+					<patch:attribute name="physicalRootPath">C:\projects\Sitecore.SharedSource.DynamicSitemap\Unicorn-Serialization\$(configurationName)</patch:attribute>
+				</targetDataStore>
+			</defaults>
+		</unicorn>
+	</sitecore>
+</configuration>
diff --git a/Sitecore.SharedSource.DynamicSitemap.UnicornWeb/App_Config/Include/Unicorn/Unicorn.DataProvider.config b/Sitecore.SharedSource.DynamicSitemap.UnicornWeb/App_Config/Include/Unicorn/Unicorn.DataProvider.config
new file mode 100644
index 0000000..bdcc320
--- /dev/null
+++ b/Sitecore.SharedSource.DynamicSitemap.UnicornWeb/App_Config/Include/Unicorn/Unicorn.DataProvider.config
@@ -0,0 +1,53 @@
+<!--
+	Unicorn Data Provider Configuration
+
+	This file configures the Unicorn data provider. The data provider writes updated serialized items to disk when they are changed.
+
+	This file should be removed in ANY deployed instance (CE or CD) that does not act as a source for serialized item updates.
+	Generally speaking that's anywhere other than a developer workstation, so your CI process (you have one, right?) should remove this file during the build.
+	IMPORTANT EXCEPTION: If you are using Transparent Sync as a deployment mechanism, this file must remain on your CE environment.
+
+	http://github.com/kamsar/Unicorn
+-->
+<configuration xmlns:patch="http://www.sitecore.net/xmlconfig/">
+	<sitecore>
+		<dataProviders>
+			<!--
+				Register the Unicorn data provider for use. If a database hooks to the Unicorn data provider it will
+				automatically write changes to the database that match any configured predicate into the serialization provider.
+
+				Changes that only affect Revision, Modified, or any fields ignored by FieldPredicates will be ignored.
+			-->
+			<unicorn type="Unicorn.Data.DataProvider.Unicorn$(database)DataProvider, Unicorn">
+				<param connectionStringName="$(1)"/>
+				<Name>$(1)</Name>
+			</unicorn>
+		</dataProviders>
+
+		<!--
+			Hook the Unicorn Data Provider into the master and core databases. If you're not
+			syncing anything in core you can safely unregister it from here. If you want to
+			sync something to another database register	it here.
+
+			It's safe to remove this config section on any environment where you are not
+			collecting item changes, which may mean anywhere other than local development
+			sites. This will avoid any performance hit from writing unused serialized files.
+		-->
+		<databases>
+			<database id="master">
+				<dataProviders>
+					<dataProvider ref="dataProviders/main">
+						<patch:attribute name="ref">dataProviders/unicorn</patch:attribute>
+					</dataProvider>
+				</dataProviders>
+			</database>
+			<database id="core">
+				<dataProviders>
+					<dataProvider ref="dataProviders/main">
+						<patch:attribute name="ref">dataProviders/unicorn</patch:attribute>
+					</dataProvider>
+				</dataProviders>
+			</database>
+		</databases>
+	</sitecore>
+</configuration>
diff --git a/Sitecore.SharedSource.DynamicSitemap.UnicornWeb/App_Config/Include/Unicorn/Unicorn.UI.config b/Sitecore.SharedSource.DynamicSitemap.UnicornWeb/App_Config/Include/Unicorn/Unicorn.UI.config
new file mode 100644
index 0000000..cbf90d1
--- /dev/null
+++ b/Sitecore.SharedSource.DynamicSitemap.UnicornWeb/App_Config/Include/Unicorn/Unicorn.UI.config
@@ -0,0 +1,98 @@
+<!--
+	Unicorn UI Configuration
+
+	This file configures the Unicorn UI elements, including: Unicorn control panel (/unicorn.aspx), content editor commands (partial sync/reserialize), content editor warnings, and serialization conflict warning.
+	
+	This file should be removed when deploying to Content Delivery environments to remove all Unicorn UI elements, which are not needed in CD.
+
+	http://github.com/kamsar/Unicorn
+-->
+<configuration xmlns:patch="http://www.sitecore.net/xmlconfig/">
+	<sitecore>
+		<unicorn>
+			<!-- 
+				Authentication Provider
+				Provides a security protocol to determine who has access to the Unicorn Control Panel
+			-->
+			<authenticationProvider type="Unicorn.ControlPanel.Security.ChapAuthenticationProvider, Unicorn">
+				<!--<SharedSecret></SharedSecret> Uncomment this line and provide a strong randomized shared secret here. At least 64 characters is recommended, for example https://www.grc.com/passwords.htm -->
+				<!-- Authentication challenges are stored in a Sitecore database. You can select which database here. No item installs/templates are required. -->
+				<ChallengeDatabase>web</ChallengeDatabase>
+				<!-- 
+					Writes the reason why failed automated tool authentications failed to the Sitecore logs.
+					Will result in writing your shared secret to the logs as part of the signature base,
+					so you can disable it if you wish.
+				-->
+				<WriteAuthFailuresToLog>false</WriteAuthFailuresToLog>
+			</authenticationProvider>
+			<!--
+				Legacy provider: this provides Unicorn 2.x and 3.0.x behavior for the security token. Deprecated.
+				<authenticationProvider type="Unicorn.ControlPanel.Security.LegacyAuthenticationProvider, Unicorn" />
+			-->
+		</unicorn>
+		<processors>
+			<saveUI>
+				<!--
+					This processor will compare the pre-save version of the item to what's serialized on disk
+					and throw a warning box if they do not match. This helps prevent overwriting of data if you
+					happen to forget to sync changes into Sitecore.
+
+					All configurations are evaluated by the processor. Fields ignored by the FieldPredicate are ignored.
+				-->
+				<processor patch:before="*[@type='Sitecore.Pipelines.Save.Save, Sitecore.Kernel']" mode="on" type="Unicorn.UI.Pipelines.SaveUi.SerializationConflictProcessor, Unicorn"/>
+			</saveUI>
+		</processors>
+
+		<pipelines>
+			<httpRequestBegin>
+				<!--
+					This pipeline handler shows the Unicorn control panel. You can customize the URL the control panel lives at by changing the activationUrl.
+					The activationUrl must be a URL that the Sitecore pipeline won't ignore (e.g. .aspx, .ashx, etc)
+				-->
+				<processor patch:after="*[@type='Sitecore.Pipelines.HttpRequest.UserResolver, Sitecore.Kernel']" type="Unicorn.ControlPanel.UnicornControlPanelPipelineProcessor">
+					<param desc="activationUrl">/unicorn.aspx</param>
+				</processor>
+			</httpRequestBegin>
+			<filterItem>
+				<processor patch:before="*[@type='Sitecore.Pipelines.FilterItem.CheckIfFilteringIsActive, Sitecore.Kernel']" type="Unicorn.ControlPanel.CheckIfFilterDisablerIsActive, Unicorn" />
+			</filterItem>
+			<getContentEditorWarnings>
+				<processor type="Unicorn.UI.Pipelines.GetContentEditorWarnings.SerializedWarning, Unicorn" />
+			</getContentEditorWarnings>
+
+			<!--
+				This 'micro-pipeline' controls the rendering of the Unicorn control panel.
+				This is handy because it allows you to add new verbs or alter the appearance of the control panel.
+			-->
+			<unicornControlPanelRequest>
+				<processor type="Unicorn.ControlPanel.Pipelines.UnicornControlPanelRequest.ChallengeVerb, Unicorn" />
+				<processor type="Unicorn.ControlPanel.Pipelines.UnicornControlPanelRequest.SyncVerb, Unicorn" />
+				<processor type="Unicorn.ControlPanel.Pipelines.UnicornControlPanelRequest.ReserializeVerb, Unicorn" />
+				<processor type="Unicorn.ControlPanel.Pipelines.UnicornControlPanelRequest.HandleAccessDenied, Unicorn" />
+				<processor type="Unicorn.ControlPanel.Pipelines.UnicornControlPanelRequest.RenderControlPanel, Unicorn" />
+			</unicornControlPanelRequest>
+		</pipelines>
+
+		<commands>
+			<!--
+				Replaces Sitecore admin serialization commands (on the Developer tab of the ribbon) with Unicorn ones.
+				With these installed, if you serialize, load, or revert trees or items in the context of items that
+				are included in Unicorn, regular Sitecore serialization will be replaced with Unicorn reserialization
+				or Unicorn syncing of that item (or tree) instead. Note that "update" and "revert" are the same thing
+				in the context of Unicorn - a sync.
+			-->
+			<command name="itemsync:dumpitem">
+				<patch:attribute name="type">Unicorn.UI.Commands.UnicornDumpItemCommand, Unicorn</patch:attribute>
+			</command>
+			<command name="itemsync:dumptree">
+				<patch:attribute name="type">Unicorn.UI.Commands.UnicornDumpTreeCommand, Unicorn</patch:attribute>
+			</command>
+			<command name="itemsync:loaditem">
+				<patch:attribute name="type">Unicorn.UI.Commands.UnicornLoadItemCommand, Unicorn</patch:attribute>
+			</command>
+			<command name="itemsync:loadtree">
+				<patch:attribute name="type">Unicorn.UI.Commands.UnicornLoadTreeCommand, Unicorn</patch:attribute>
+			</command>
+		</commands>
+	</sitecore>
+</configuration>
diff --git a/Sitecore.SharedSource.DynamicSitemap.UnicornWeb/App_Config/Include/Unicorn/Unicorn.config b/Sitecore.SharedSource.DynamicSitemap.UnicornWeb/App_Config/Include/Unicorn/Unicorn.config
new file mode 100644
index 0000000..a7e00b4
--- /dev/null
+++ b/Sitecore.SharedSource.DynamicSitemap.UnicornWeb/App_Config/Include/Unicorn/Unicorn.config
@@ -0,0 +1,211 @@
+<!--
+	Unicorn.config
+
+	This file configures the Unicorn serialization system, which enables automatic
+	synchronization of Sitecore items without packages or manual merging.
+
+	This file should be present on all environments Unicorn is present on. It is
+	safe to leave on Content Delivery servers, as it changes no stock Sitecore
+	configuration.
+
+	http://github.com/kamsar/Unicorn
+-->
+<configuration xmlns:patch="http://www.sitecore.net/xmlconfig/">
+	<sitecore>
+		<unicorn>
+			<!--
+				Configurations
+
+				These define sets of configuration that Unicorn can run. For example, you might
+				want to serialize certain items differently, or segregate configurations so
+				that critical ones can run separately from non-essential ones to save time.
+
+				See the README here for more information:
+				https://github.com/kamsar/Unicorn/blob/master/README.md
+
+				If you're familiar with DI and IoC containers, each configuration is effectively
+				a dependency container which inherits from the global container defined in
+				<defaults>.
+
+				NOTE: Your own configurations should be defined in config patch files. See
+				Unicorn.Configs.Default.example for a baseline you can make your own from.
+			-->
+			<configurations>
+			</configurations>
+
+			<!--
+				These are the default Unicorn dependency configurations. These affect all
+				configurations,	unless specifically overridden in the configuration definition.
+
+				Each dependency type can have non-dependency constructor params passed to it by
+				adding XML attributes to the main declaration - e.g. <foo type="..." bar="hello">
+				would pass "hello" to public MyType(string bar)
+
+				You can also receive any XML body passed to the dependency to a 'configNode'
+				XmlElement parameter. This is how the SerializationPresetPredicate defines its
+				preset.
+
+				Did you know you can define your own global dependencies and override them in
+				configurations? You can!
+			-->
+			<defaults>
+				<!-- The source data store is where we read data from. Usually, this would be Sitecore. -->
+				<sourceDataStore type="Rainbow.Storage.Sc.SitecoreDataStore, Rainbow.Storage.Sc" singleInstance="true"/>
+
+				<!--
+						The target data store is where we write serialized items to.
+
+						Note the target data store's rootPath can be any of:
+						Absolute filesystem path, e.g. c:\foo\bar
+						Web-root-relative path, e.g. ~/data/serialization or ~/../out-of-root-serialization
+						Data-folder-relative path, e.g. $(dataFolder)\serializedItems
+
+						DO NOT SHARE A ROOT PATH BETWEEN CONFIGURATIONS (at least if you're using SFS).
+						They can clobber each other's folders. You may inject the name of the current
+						configuration as a variable with $(configurationName).
+
+						The data cache uses a memory cache to store serialized items read from disk. It
+						is recommended if using transparent syncing for performance. It's not really
+						needed otherwise.
+					-->
+				<targetDataStore physicalRootPath="$(dataFolder)\Unicorn\$(configurationName)" useDataCache="false" type="Rainbow.Storage.SerializationFileSystemDataStore, Rainbow" singleInstance="true"/>
+
+				<serializationFormatter type="Rainbow.Storage.Yaml.YamlSerializationFormatter, Rainbow.Storage.Yaml" singleInstance="true">
+					<fieldFormatter type="Rainbow.Formatting.FieldFormatters.MultilistFormatter, Rainbow" />
+					<fieldFormatter type="Rainbow.Formatting.FieldFormatters.XmlFieldFormatter, Rainbow" />
+					<fieldFormatter type="Rainbow.Formatting.FieldFormatters.CheckboxFieldFormatter, Rainbow" />
+				</serializationFormatter>
+
+				<deserializer type="Unicorn.Deserialization.UnicornDeserializer, Unicorn" singleInstance="true" />
+					<deserializerLogger type="Unicorn.Deserialization.DefaultDeserializerLogger, Unicorn" singleInstance="true"/>
+
+				<evaluator type="Unicorn.Evaluators.SerializedAsMasterEvaluator, Unicorn" singleInstance="true"/>
+					<evaluatorLogger type="Unicorn.Evaluators.DefaultSerializedAsMasterEvaluatorLogger, Unicorn" singleInstance="true"/>
+
+				<!-- The ItemComparer handles comparing items for the Evaluator and SerializationConflictProcessor -->
+				<itemComparer type="Rainbow.Diff.ItemComparer, Rainbow" singleInstance="true">
+					<!--
+					  You may add your own field comparisons here to determine equality - they are
+					  evaluated in order and the first one to say it can compare gets the job.
+
+					  Note: the DefaultComparison, which does a string Equals() comparison, is
+					  automatically registered last and does not need to appear here.
+					-->
+					<fieldComparer type="Rainbow.Diff.Fields.XmlComparison, Rainbow" />
+					<fieldComparer type="Rainbow.Diff.Fields.MultiLineTextComparison, Rainbow" />
+					<fieldComparer type="Rainbow.Diff.Fields.MultilistComparison, Rainbow" />
+					<fieldComparer type="Rainbow.Diff.Fields.CheckboxComparison, Rainbow" />
+				</itemComparer>
+
+				<!-- There is no default predicate, because this must be configured for each configuration. -->
+				<predicate type="null"/>
+
+				<!--
+					The field filter can be used to ignore fields when comparing or serializing (i.e. don't write them to disk).
+					Commonly, metadata fields such as Last Updated will be ignored to prevent SCM conflicts.
+				-->
+				<fieldFilter type="Rainbow.Filtering.ConfigurationFieldFilter, Rainbow" singleInstance="true">
+					<exclude fieldID="{B1E16562-F3F9-4DDD-84CA-6E099950ECC0}" note="'Last run' field on Schedule template (used to register tasks)" />
+					<exclude fieldID="{52807595-0F8F-4B20-8D2A-CB71D28C6103}" note="'__Owner' field on Standard Template" />
+					<exclude fieldID="{F6D8A61C-2F84-4401-BD24-52D2068172BC}" note="'__Originator' field on Standard Template" />
+					<exclude fieldID="{8CDC337E-A112-42FB-BBB4-4143751E123F}" note="'__Revision' field on Standard Template" />
+					<exclude fieldID="{D9CF14B1-FA16-4BA6-9288-E8A174D4D522}" note="'__Updated' field on Standard Template" />
+					<exclude fieldID="{BADD9CF9-53E0-4D0C-BCC0-2D784C282F6A}" note="'__Updated by' field on Standard Template" />
+					<exclude fieldID="{001DD393-96C5-490B-924A-B0F25CD9EFD8}" note="'__Lock' field on Standard Template" />
+				</fieldFilter>
+				
+				<!-- 
+					Controls configuration-level sync settings
+					
+					UpdateLinkDatabase: If true, the links will be updated for synced items after the sync has completed. If false (default) links are not updated for performance.
+						Updating links is important if you are syncing user-facing content where link tracking is important. It is not very important for system items (templates/renderings).
+						
+					UpdateSearchIndex: If true, the search index(es) containing the item will be updated with item changes after the sync has completed. If false, indexing will not be updated for performance.
+						Updating the index is important for content that relies on indexing, which may include most user-facing content items. Most of the time templates and renderings don't need indexing.
+						
+					MaxConcurrency: Controls how many threads Unicorn can use when syncing this configuration. Concurrency can usually increase sync speed 30-50% over single threading.
+						IF YOUR CONFIGURATION INCLUDES TEMPLATES YOU MUST SET THIS TO 1 OR YOUR SYNC WILL HANG INDEFINITELY DUE TO A SITECORE ISSUE
+						IF YOU ARE ON SITECORE 8.0 U2 OR EARLIER, YOU MUST SET THIS TO 1 DUE TO A SITECORE ISSUE
+						
+						This value can be set to significantly higher than the number of CPU cores, as these are largely I/O bound.
+						Use fewer threads for HDDs or slow SQL servers, and more threads for SSDs.
+						For a SSD workload on a quad-core CPU 16 seems to be a decent number.
+						
+					NOTE: UpdateLinkDatabase and UpdateSearchIndex also apply to items that are reloaded from disk when using Transparent Sync, as well as normal Sync.
+				-->
+				<syncConfiguration updateLinkDatabase="false" updateSearchIndex="false" maxConcurrency="1" type="Unicorn.Loader.DefaultSyncConfiguration, Unicorn" singleInstance="true" />
+
+				<!-- Note that the DebugSerializationLoaderLogger is also available if you want more detailed logging and timing information. -->
+				<loaderLogger type="Unicorn.Loader.DefaultSerializationLoaderLogger, Unicorn" singleInstance="true"/>
+
+				<loaderConsistencyChecker type="Unicorn.Loader.DuplicateIdConsistencyChecker, Unicorn"/>
+					<loaderConsistencyCheckerLogger type="Unicorn.Loader.DefaultDuplicateIdConsistencyCheckerLogger, Unicorn" singleInstance="false"/>
+
+				<loaderDeserializeFailureRetryer type="Unicorn.Loader.DeserializeFailureRetryer, Unicorn" singleInstance="false"/>
+
+				<dataProviderConfiguration enableTransparentSync="false" type="Unicorn.Data.DataProvider.DefaultUnicornDataProviderConfiguration, Unicorn" singleInstance="true" />
+					<dataProviderLogger type="Unicorn.Data.DataProvider.DefaultUnicornDataProviderLogger, Unicorn" singleInstance="true"/>
+
+				<logger type="Unicorn.Logging.PubSubLogger, Unicorn" singleInstance="true" />
+
+				<syncCompleteDataCollector type="Unicorn.Pipelines.UnicornSyncComplete.DefaultSyncCompleteDataCollector, Unicorn" singleInstance="true" />
+			</defaults>
+
+			<!--
+				The configuration provider wires up how the configuration(s) Unicorn is running are parsed.
+				The default provider reads values from this config section.
+			-->
+			<configurationProvider type="Unicorn.Configuration.XmlConfigurationProvider, Unicorn"/>
+		</unicorn>
+
+		<settings>
+			<!--
+				Controls how many threads Unicorn can use when reserializing (NOT syncing).
+				This value can be set to significantly higher than the number of CPU cores, as these are largely I/O bound.
+				Use fewer threads for HDDs or slow SQL servers, and more threads for SSDs.
+				For a SSD workload on a quad-core CPU 16 seems to be a decent number.
+
+				NOTE: certain older versions of Sitecore 7.x and early versions of 8.0 (<= u2) have a SQL deadlocking issue that can be exposed with high concurrency.
+				If you receive "timed out before getting a connection from the pool" errors when syncing, you may need to upgrade Sitecore
+				or reduce the concurrency to 1 to resolve the issue. All versions of 7.5 have this problem.
+				
+				Recommended value: 16 (for Sitecore 8.0U2 or earlier, 1 - the default, because it's safe for all supported versions)
+			-->
+			<setting name="Unicorn.MaximumWriteConcurrency" value="1" />
+		</settings>
+		<pipelines>
+			<!-- Run before a configuration starts sync. Handlers should implement IUnicornSyncBeginProcessor -->
+			<unicornSyncBegin>
+				<processor type="Unicorn.Pipelines.UnicornSyncBegin.ResetSyncCompleteDataCollector, Unicorn" />
+			</unicornSyncBegin>
+			
+			<!-- Run after a configuration completes sync. Handlers should implement IUnicornSyncCompleteProcessor -->
+			<unicornSyncComplete>
+				<processor type="Unicorn.Pipelines.UnicornSyncComplete.DictionaryCacheClearer, Unicorn" />
+				<processor type="Unicorn.Pipelines.UnicornSyncComplete.SyncedItemPostProcessor, Unicorn" />
+				<processor type="Unicorn.Pipelines.UnicornSyncComplete.SyncCompleteLogger, Unicorn" />
+			</unicornSyncComplete>
+			
+			<!-- Run after all configuration(s) complete sync. Handlers should implement IUnicornSyncEndProcessor -->
+			<unicornSyncEnd>
+				<processor type="Unicorn.Pipelines.UnicornSyncEnd.SendSerializationCompleteEvent, Unicorn" />
+			</unicornSyncEnd>
+
+			<!-- Run after a configuration completes reserialization. Handlers should implement IUnicornReserializeCompleteProcessor -->
+			<unicornReserializeComplete>
+			</unicornReserializeComplete>
+		</pipelines>
+
+		<processors>
+			<saveUI>
+				<!-- Prevent fake 'overwrite?' warnings when using transparent sync due to how it handles revisions -->
+				<processor mode="on" type="Unicorn.Pipelines.SaveUi.TransparentSyncAwareCheckRevision, Unicorn" patch:instead="processor[contains(@type, 'CheckRevision')]"/>
+			</saveUI>
+		</processors>
+
+		<sitecore.experienceeditor.speak.requests>
+			<!-- Prevent fake 'overwrite?' warnings when using transparent sync due to how it handles revisions -->
+			<request patch:instead="*[@name='ExperienceEditor.Save.CheckRevision']" name="ExperienceEditor.Save.CheckRevision" type="Unicorn.ExperienceEditor.Speak.Ribbon.Requests.SaveItem.TransparentSyncAwareCheckRevision, Unicorn"/>
+		</sitecore.experienceeditor.speak.requests>
+	</sitecore>
+</configuration>
diff --git a/Sitecore.SharedSource.DynamicSitemap.UnicornWeb/Properties/AssemblyInfo.cs b/Sitecore.SharedSource.DynamicSitemap.UnicornWeb/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..7edb8fd
--- /dev/null
+++ b/Sitecore.SharedSource.DynamicSitemap.UnicornWeb/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Sitecore.SharedSource.DynamicSitemap.UnicornWeb")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Sitecore.SharedSource.DynamicSitemap.UnicornWeb")]
+[assembly: AssemblyCopyright("Copyright ©  2017")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("36d13671-06ac-40ec-8825-eaa9223fc229")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Sitecore.SharedSource.DynamicSitemap.UnicornWeb/Sitecore.SharedSource.DynamicSitemap.UnicornWeb.csproj b/Sitecore.SharedSource.DynamicSitemap.UnicornWeb/Sitecore.SharedSource.DynamicSitemap.UnicornWeb.csproj
new file mode 100644
index 0000000..788c367
--- /dev/null
+++ b/Sitecore.SharedSource.DynamicSitemap.UnicornWeb/Sitecore.SharedSource.DynamicSitemap.UnicornWeb.csproj
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.0\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.0\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
+  <Import Project="..\packages\Microsoft.Net.Compilers.1.0.0\build\Microsoft.Net.Compilers.props" Condition="Exists('..\packages\Microsoft.Net.Compilers.1.0.0\build\Microsoft.Net.Compilers.props')" />
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>
+    </ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{36D13671-06AC-40EC-8825-EAA9223FC229}</ProjectGuid>
+    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Sitecore.SharedSource.DynamicSitemap.UnicornWeb</RootNamespace>
+    <AssemblyName>Sitecore.SharedSource.DynamicSitemap.UnicornWeb</AssemblyName>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <UseIISExpress>true</UseIISExpress>
+    <IISExpressSSLPort />
+    <IISExpressAnonymousAuthentication />
+    <IISExpressWindowsAuthentication />
+    <IISExpressUseClassicPipelineMode />
+    <UseGlobalApplicationHostFile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Kamsar.WebConsole, Version=1.2.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Kamsar.WebConsole.1.2.2.0\lib\net40\Kamsar.WebConsole.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="MicroCHAP, Version=1.2.2.2, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MicroCHAP.1.2.2.2\lib\net45\MicroCHAP.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Rainbow, Version=1.4.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Rainbow.Core.1.4.1\lib\net452\Rainbow.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Rainbow.Storage.Sc, Version=1.4.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Rainbow.Storage.Sc.1.4.1\lib\net452\Rainbow.Storage.Sc.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Rainbow.Storage.Yaml, Version=1.4.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Rainbow.Storage.Yaml.1.4.1\lib\net452\Rainbow.Storage.Yaml.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Web.DynamicData" />
+    <Reference Include="System.Web.Entity" />
+    <Reference Include="System.Web.ApplicationServices" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Web.Extensions" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Web" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Web.Services" />
+    <Reference Include="System.EnterpriseServices" />
+    <Reference Include="Unicorn, Version=3.3.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Unicorn.Core.3.3.2\lib\net452\Unicorn.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="..\Sitecore.SharedSource.DynamicSitemap\sitecore modules\Shell\Dynamic Sitemap XML\DynamicSitemapManager.xml">
+      <Link>sitecore modules\Shell\Dynamic Sitemap XML\DynamicSitemapManager.xml</Link>
+    </Content>
+    <Content Include="App_Config\Include\Rainbow.config" />
+    <Content Include="App_Config\Include\Unicorn\Unicorn.UI.config" />
+    <Content Include="App_Config\Include\Unicorn\Unicorn.DataProvider.config" />
+    <Content Include="App_Config\Include\Unicorn\Unicorn.config" />
+    <Content Include="App_Config\Include\Unicorn\Unicorn.AutoPublish.config" />
+    <Content Include="App_Config\Include\Unicorn\Unicorn.Configs.DynamicSitemap.config" />
+    <Content Include="App_Config\Include\Unicorn\Unicorn.CustomSerializationFolder.config" />
+    <Content Include="..\Sitecore.SharedSource.DynamicSitemap\App_Config\Include\Sitecore.SharedSource.DynamicSitemap.config">
+      <Link>App_Config\Include\Sitecore.SharedSource.DynamicSitemap.config</Link>
+    </Content>
+    <None Include="Web.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Sitecore.SharedSource.DynamicSitemap.ItemsProcessor\Sitecore.SharedSource.DynamicSitemap.ItemsProcessor.csproj">
+      <Project>{21b0ab34-57d2-41ed-8e6d-c22dd14b0577}</Project>
+      <Name>Sitecore.SharedSource.DynamicSitemap.ItemsProcessor</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Sitecore.SharedSource.DynamicSitemap\Sitecore.SharedSource.DynamicSitemap.csproj">
+      <Project>{57a4efdd-889f-47cf-a47b-b65f813cb234}</Project>
+      <Name>Sitecore.SharedSource.DynamicSitemap</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+        <WebProjectProperties>
+          <UseIIS>True</UseIIS>
+          <AutoAssignPort>True</AutoAssignPort>
+          <DevelopmentServerPort>63031</DevelopmentServerPort>
+          <DevelopmentServerVPath>/</DevelopmentServerVPath>
+          <IISUrl>http://localhost:63031/</IISUrl>
+          <NTLMAuthentication>False</NTLMAuthentication>
+          <UseCustomServer>False</UseCustomServer>
+          <CustomServerUrl>
+          </CustomServerUrl>
+          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
+        </WebProjectProperties>
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\Microsoft.Net.Compilers.1.0.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Net.Compilers.1.0.0\build\Microsoft.Net.Compilers.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.0\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.0\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
+  </Target>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/Sitecore.SharedSource.DynamicSitemap.UnicornWeb/Web.config b/Sitecore.SharedSource.DynamicSitemap.UnicornWeb/Web.config
new file mode 100644
index 0000000..b976e20
--- /dev/null
+++ b/Sitecore.SharedSource.DynamicSitemap.UnicornWeb/Web.config
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  For more information on how to configure your ASP.NET application, please visit
+  http://go.microsoft.com/fwlink/?LinkId=169433
+  -->
+<configuration>
+  <system.web>
+    <compilation debug="true" targetFramework="4.5.2"/>
+    <httpRuntime targetFramework="4.5.2"/>
+  </system.web>
+  <system.codedom>
+    <compilers>
+      <compiler language="c#;cs;csharp" extension=".cs"
+        type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+        warningLevel="4" compilerOptions="/langversion:6 /nowarn:1659;1699;1701"/>
+      <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb"
+        type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+        warningLevel="4" compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+"/>
+    </compilers>
+  </system.codedom>
+</configuration>
\ No newline at end of file
diff --git a/Sitecore.SharedSource.DynamicSitemap.UnicornWeb/packages.config b/Sitecore.SharedSource.DynamicSitemap.UnicornWeb/packages.config
new file mode 100644
index 0000000..8f675c2
--- /dev/null
+++ b/Sitecore.SharedSource.DynamicSitemap.UnicornWeb/packages.config
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Kamsar.WebConsole" version="1.2.2.0" targetFramework="net452" />
+  <package id="MicroCHAP" version="1.2.2.2" targetFramework="net452" />
+  <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="1.0.0" targetFramework="net452" />
+  <package id="Microsoft.Net.Compilers" version="1.0.0" targetFramework="net452" developmentDependency="true" />
+  <package id="Rainbow" version="1.4.1" targetFramework="net452" />
+  <package id="Rainbow.Core" version="1.4.1" targetFramework="net452" />
+  <package id="Rainbow.Storage.Sc" version="1.4.1" targetFramework="net452" />
+  <package id="Rainbow.Storage.Yaml" version="1.4.1" targetFramework="net452" />
+  <package id="Unicorn" version="3.3.2" targetFramework="net452" />
+  <package id="Unicorn.Core" version="3.3.2" targetFramework="net452" />
+</packages>
\ No newline at end of file
diff --git a/Sitecore.SharedSource.DynamicSitemap.sln b/Sitecore.SharedSource.DynamicSitemap.sln
index c2899c8..c5b7921 100644
--- a/Sitecore.SharedSource.DynamicSitemap.sln
+++ b/Sitecore.SharedSource.DynamicSitemap.sln
@@ -9,6 +9,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sitecore.SharedSource.Dynam
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sitecore.SharedSource.DynamicSitemap.ItemsProcessor", "Sitecore.SharedSource.DynamicSitemap.ItemsProcessor\Sitecore.SharedSource.DynamicSitemap.ItemsProcessor.csproj", "{21B0AB34-57D2-41ED-8E6D-C22DD14B0577}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sitecore.SharedSource.DynamicSitemap.UnicornWeb", "Sitecore.SharedSource.DynamicSitemap.UnicornWeb\Sitecore.SharedSource.DynamicSitemap.UnicornWeb.csproj", "{36D13671-06AC-40EC-8825-EAA9223FC229}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -27,6 +29,10 @@ Global
 		{21B0AB34-57D2-41ED-8E6D-C22DD14B0577}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{21B0AB34-57D2-41ED-8E6D-C22DD14B0577}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{21B0AB34-57D2-41ED-8E6D-C22DD14B0577}.Release|Any CPU.Build.0 = Release|Any CPU
+		{36D13671-06AC-40EC-8825-EAA9223FC229}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{36D13671-06AC-40EC-8825-EAA9223FC229}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{36D13671-06AC-40EC-8825-EAA9223FC229}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{36D13671-06AC-40EC-8825-EAA9223FC229}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Sitecore.SharedSource.DynamicSitemap/App_Config/Include/Sitecore.SharedSource.DynamicSitemap.config b/Sitecore.SharedSource.DynamicSitemap/App_Config/Include/Sitecore.SharedSource.DynamicSitemap.config
index cb2b17d..88368f8 100644
--- a/Sitecore.SharedSource.DynamicSitemap/App_Config/Include/Sitecore.SharedSource.DynamicSitemap.config
+++ b/Sitecore.SharedSource.DynamicSitemap/App_Config/Include/Sitecore.SharedSource.DynamicSitemap.config
@@ -17,7 +17,9 @@
       -->
 
       <event name="publish:end">
-        <handler type="Sitecore.SharedSource.DynamicSitemap.DynamicSitemapGenerator, Sitecore.SharedSource.DynamicSitemap" method="RegenerateSitemap" />
+        <handler
+          type="Sitecore.SharedSource.DynamicSitemap.DynamicSitemapGenerator, Sitecore.SharedSource.DynamicSitemap"
+          method="RegenerateSitemap" />
       </event>
 
     </events>
@@ -46,7 +48,7 @@
       <sitemapVariable name="database" value="web" />
 
       <!-- Sitemaps output folder -->
-      <sitemapVariable name="sitemapConfigurationOutputFolder" value="/sitemaps" />
+      <sitemapVariable name="sitemapConfigurationOutputFolder" value="sitemaps" />
 
       <!-- Refresh robots file -->
       <sitemapVariable name="refreshRobotsFile" value="true" />
@@ -55,7 +57,7 @@
       <sitemapVariable name="useSitemapsIndexFile" value="true" />
 
       <!-- Indicates production environment -->
-      <sitemapVariable name="productionEnvironment" value="false" />
+      <sitemapVariable name="submitToSearchEngine" value="false" />
 
     </dynamicSitemap>
 
diff --git a/Sitecore.SharedSource.DynamicSitemap/Configuration/DynamicSitemapConfiguration.cs b/Sitecore.SharedSource.DynamicSitemap/Configuration/DynamicSitemapConfiguration.cs
index 248335d..3fb885c 100644
--- a/Sitecore.SharedSource.DynamicSitemap/Configuration/DynamicSitemapConfiguration.cs
+++ b/Sitecore.SharedSource.DynamicSitemap/Configuration/DynamicSitemapConfiguration.cs
@@ -1,4 +1,5 @@
 using Sitecore.Xml;
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -77,11 +78,11 @@ public static string SitemapConfigurationOutputFolder
             }
         }
 
-        public static bool IsProductionEnvironment
+        public static bool SubmitToSearchEngine
         {
             get
             {
-                string valueByName = GetValueByName("productionEnvironment");
+                string valueByName = GetValueByName("submitToSearchEngine");
                 return !string.IsNullOrEmpty(valueByName) && (valueByName.ToLower() == "true" || valueByName == "1");
             }
         }
@@ -119,4 +120,4 @@ private static string GetValueByName(string name)
             return result;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Sitecore.SharedSource.DynamicSitemap/Constants/Messages.cs b/Sitecore.SharedSource.DynamicSitemap/Constants/Messages.cs
index d25677b..f9b25a6 100644
--- a/Sitecore.SharedSource.DynamicSitemap/Constants/Messages.cs
+++ b/Sitecore.SharedSource.DynamicSitemap/Constants/Messages.cs
@@ -9,17 +9,24 @@ public static class Messages
     {
         public static readonly String Label = "DynamicSitemapGenerator: ";
 
-        public static readonly String ExecutionInterrupted = Label + "There are no sitemap configurations, execution interrupted.";
+        public static readonly String ExecutionInterrupted = Label
+                                                             + "There are no sitemap configurations, execution interrupted.";
+
         public static readonly String NoConfigurations = Label + "There are no sitemap configurations.";
-        public static readonly String NoGlobalScConfiguration = Label + "There is no global Sitecore configuration Item.";
 
-        public static readonly String ExceptionWhileBuilding = Label + "Exception while building sitemap for {0} - {1}\n\n{2}";
+        public static readonly String NoGlobalScConfiguration = Label
+                                                                + "There is no global Sitecore configuration Item.";
+
+        public static readonly String ExceptionWhileBuilding = Label
+                                                               + "Exception while building sitemap for {0} - {1}\n\n{2}";
 
         public static readonly String SitemapBuidSuccess = Label + "Sitemap generated - {0}";
 
         public static readonly String SitemapSubmitterCannotSubmit = Label + "Cannot submit sitemap to \"{0}\" - {1}";
-        public static readonly String SitemapSubmitterExceptionWhileSubmit = Label + "Search engine submission \"{0}\" returns an error - {1} \n\n{2}";
+
+        public static readonly String SitemapSubmitterExceptionWhileSubmit = Label
+                                                                             + "Search engine submission \"{0}\" returns an error - {1} \n\n{2}";
 
         public static readonly String CannotLoadItemsProcessor = Label + "Cannot load ItemsProcessor type \"{0}\"";
     }
-}
+}
\ No newline at end of file
diff --git a/Sitecore.SharedSource.DynamicSitemap/Constants/TemplateIds.cs b/Sitecore.SharedSource.DynamicSitemap/Constants/TemplateIds.cs
index 3ae76ec..0e34fd2 100644
--- a/Sitecore.SharedSource.DynamicSitemap/Constants/TemplateIds.cs
+++ b/Sitecore.SharedSource.DynamicSitemap/Constants/TemplateIds.cs
@@ -12,11 +12,15 @@ public class TemplateIds
         public const String SearchEngineTemplateId = "{BAFCD634-F023-462E-A5B8-B4D569701F2C}";
 
         public const String ChangeFrequencyDefinitionsFolderTemplateId = "{6E82C74A-5940-473B-8B60-CBB9D79EDB2D}";
+
         public const String ChangeFrequencyForItemsTemplateId = "{9551D9F7-A66A-4A49-A705-B0B2918C0EB5}";
+
         public const String ChangeFrequencyForTemplatesTemplateId = "{A1F7C913-E331-4172-BD26-0621DFBCD529}";
 
         public const String PriorityDefinitionsFolderTemplateId = "{FEDC5E17-4E3E-4057-B191-9D3EFC486277}";
+
         public const String PriorityForItemsTemplateId = "{0C77276D-A087-4613-94ED-4E90ADB1495E}";
+
         public const String PriorityForTemplatesTemplateId = "{7E6B48A3-BD98-4786-AD75-CBC469B4988C}";
     }
-}
+}
\ No newline at end of file
diff --git a/Sitecore.SharedSource.DynamicSitemap/DynamicSitemapGenerator.cs b/Sitecore.SharedSource.DynamicSitemap/DynamicSitemapGenerator.cs
index 40d185b..fb62aee 100644
--- a/Sitecore.SharedSource.DynamicSitemap/DynamicSitemapGenerator.cs
+++ b/Sitecore.SharedSource.DynamicSitemap/DynamicSitemapGenerator.cs
@@ -1,12 +1,12 @@
 using Sitecore.Data;
 using Sitecore.Data.Items;
 using Sitecore.Globalization;
+using Sitecore.IO;
 using Sitecore.Links;
 using Sitecore.SharedSource.DynamicSitemap.Configuration;
 using Sitecore.SharedSource.DynamicSitemap.Constants;
 using Sitecore.SharedSource.DynamicSitemap.Extensions;
 using Sitecore.SharedSource.DynamicSitemap.Helpers;
-using Sitecore.SharedSource.DynamicSitemap.Interfaces;
 using Sitecore.SharedSource.DynamicSitemap.Logic;
 using Sitecore.SharedSource.DynamicSitemap.Model;
 using Sitecore.SharedSource.DynamicSitemap.Modules;
@@ -38,7 +38,7 @@ public class DynamicSitemapGenerator
         /// Sitemap index
         /// </summary>
         protected SitemapIndexConfiguration SitemapIndex { get; set; }
-        
+
         /// <summary>
         /// Sitemap file name format
         /// </summary>
@@ -59,13 +59,13 @@ public Database Database
                 return Sitecore.Configuration.Factory.GetDatabase(DynamicSitemapConfiguration.WorkingDatabase);
             }
         }
-        
+
         /// <summary>
         /// Dynamic Sitemap Generator
         /// </summary>
         public DynamicSitemapGenerator()
         {
-            SiteConfigurations = new List<SitemapSiteConfiguration>();
+            this.SiteConfigurations = new List<SitemapSiteConfiguration>();
         }
 
         /// <summary>
@@ -73,7 +73,7 @@ public DynamicSitemapGenerator()
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="args"></param>
-        public void RegenerateSitemap(object sender, System.EventArgs args)
+        public void RegenerateSitemap(object sender, EventArgs args)
         {
             if (args == null)
             {
@@ -82,22 +82,22 @@ public void RegenerateSitemap(object sender, System.EventArgs args)
 
             EnsureSitemapsDirectoryExists();
 
-            ReadConfigurations();
+            this.ReadConfigurations();
 
-            if (SiteConfigurations.Count == 0)
+            if (this.SiteConfigurations.Count == 0)
             {
-                Sitecore.Diagnostics.Log.Warn(Messages.ExecutionInterrupted, this);
+                Diagnostics.Log.Warn(Messages.ExecutionInterrupted, this);
                 return;
             }
 
-            GenerateSitemaps();
-            GenerateSitemapsIndex();
+            this.GenerateSitemaps();
+            this.GenerateSitemapsIndex();
 
-            RegisterSitemapToRobotsFile();
+            this.RegisterSitemapToRobotsFile();
 
-            if (DynamicSitemapConfiguration.IsProductionEnvironment)
+            if (DynamicSitemapConfiguration.SubmitToSearchEngine)
             {
-                var submitter = new SitemapSubmitter(SitecoreConfiguration, SiteConfigurations, Database);
+                var submitter = new SitemapSubmitter(this.SitecoreConfiguration, this.SiteConfigurations, this.Database);
                 submitter.SubmitSitemapsToSearchEngines();
             }
         }
@@ -107,21 +107,21 @@ public void RegenerateSitemap(object sender, System.EventArgs args)
         /// </summary>
         public void ReadConfigurations()
         {
-            ReadGlobalSitecoreConfiguration();
+            this.ReadGlobalSitecoreConfiguration();
 
-            Item[] configurationItems = Database.SelectItems(DynamicSitemapConfiguration.SitemapConfigurationItemPath + DynamicSitemapConfiguration.SitemapConfigurationSitesFolderName + "/*[@@templateid='" + TemplateIds.SiteConfigurationTemplateId + "']");
+            Item[] configurationItems = this.Database.SelectItems(DynamicSitemapConfiguration.SitemapConfigurationItemPath + DynamicSitemapConfiguration.SitemapConfigurationSitesFolderName + "/*[@@templateid='" + TemplateIds.SiteConfigurationTemplateId + "']");
 
             if (configurationItems.Count() == 0)
             {
-                Sitecore.Diagnostics.Log.Warn(Messages.NoConfigurations, this);
+                Diagnostics.Log.Warn(Messages.NoConfigurations, this);
                 return;
             }
 
-            SiteConfigurations = new List<SitemapSiteConfiguration>();
+            this.SiteConfigurations = new List<SitemapSiteConfiguration>();
 
             foreach (var configurationItem in configurationItems)
             {
-                var languageItems = configurationItem.Languages.Where(x => SitecoreConfiguration.ProcessedLanguages.Contains(x.Name)).ToList();
+                var languageItems = configurationItem.Languages.Where(x => this.SitecoreConfiguration.ProcessedLanguages.Contains(x.Name)).ToList();
 
                 foreach (var languageItem in languageItems)
                 {
@@ -135,7 +135,7 @@ public void ReadConfigurations()
 
                         sitemapSiteConfiguration.SitemapFileName = sitemapSiteConfiguration.SitemapFileName != String.Empty
                             ? sitemapSiteConfiguration.SitemapFileName
-                            : String.Format(_sitemapFileNameFormat, site, languageItem.Name.ToLower());
+                            : String.Format(this._sitemapFileNameFormat, site, languageItem.Name.ToLower());
 
                         sitemapSiteConfiguration.SitemapFilePath = DynamicSitemapConfiguration.SitemapConfigurationOutputFolder + "/" + sitemapSiteConfiguration.SitemapFileName;
 
@@ -153,22 +153,28 @@ public void ReadConfigurations()
 
                             else
                             {
-                                Sitecore.Diagnostics.Log.Warn(String.Format(Messages.CannotLoadItemsProcessor, sitemapSiteConfiguration.ItemsProcessorTypeToLoad), this);
+                                Diagnostics.Log.Warn(String.Format(Messages.CannotLoadItemsProcessor, sitemapSiteConfiguration.ItemsProcessorTypeToLoad), this);
                             }
                         }
-                        
-                        SiteConfigurations.Add(sitemapSiteConfiguration);
+
+                        this.SiteConfigurations.Add(sitemapSiteConfiguration);
                     }
                 }
             }
 
-            SitecoreConfiguration.MainSiteConfiguration = SiteConfigurations.FirstOrDefault(x => x.Site.Name.ToLower() == SitecoreConfiguration.MainSiteConfigurationItem.Name.ToLower());
+            this.SitecoreConfiguration.MainSiteConfiguration = this.SiteConfigurations.FirstOrDefault(x => x.Site.Name.ToLower() == this.SitecoreConfiguration.MainSiteConfigurationItem.Name.ToLower());
 
-            SitemapIndex = new SitemapIndexConfiguration();
-            SitemapIndex.ServerHost = SitecoreConfiguration.MainSiteConfiguration != null
-                ? SitecoreConfiguration.MainSiteConfiguration.ServerHost
-                : SiteConfigurations.FirstOrDefault().ServerHost;
-            SitemapIndex.FileName = _sitemapIndexFileName;
+            this.SitemapIndex = new SitemapIndexConfiguration();
+
+            var siteConfiguration = this.SitecoreConfiguration.MainSiteConfiguration ?? this.SiteConfigurations.FirstOrDefault();
+
+            if (siteConfiguration != null)
+            {
+                this.SitemapIndex.ServerHost = siteConfiguration.ServerHost;
+                this.SitemapIndex.ForceHttps = siteConfiguration.ForceHttps;
+                this.SitemapIndex.TargetHostName = siteConfiguration.TargetHost;
+            }
+            this.SitemapIndex.FileName = this._sitemapIndexFileName;
         }
 
         /// <summary>
@@ -176,11 +182,11 @@ public void ReadConfigurations()
         /// </summary>
         protected void ReadGlobalSitecoreConfiguration()
         {
-            Item globalConfigurationItem = Database.GetItem(DynamicSitemapConfiguration.SitemapConfigurationItemPath + "/Configuration");
+            Item globalConfigurationItem = this.Database.GetItem(DynamicSitemapConfiguration.SitemapConfigurationItemPath + "/Configuration");
 
             if (globalConfigurationItem == null)
             {
-                Sitecore.Diagnostics.Log.Error(Messages.NoGlobalScConfiguration, this);
+                Diagnostics.Log.Error(Messages.NoGlobalScConfiguration, this);
                 return;
             }
 
@@ -188,21 +194,21 @@ protected void ReadGlobalSitecoreConfiguration()
 
             if (globalConfigurationItem["Main Site Configuration"] != String.Empty)
             {
-                mainSiteConfiguration = Database.GetItem(globalConfigurationItem["Main Site Configuration"]);
+                mainSiteConfiguration = this.Database.GetItem(globalConfigurationItem["Main Site Configuration"]);
             }
 
-            SitecoreConfiguration = new DynamicSitemapSitecoreConfiguration();
+            this.SitecoreConfiguration = new DynamicSitemapSitecoreConfiguration();
 
             if (mainSiteConfiguration != null)
             {
-                SitecoreConfiguration.MainSiteConfigurationItem = mainSiteConfiguration;
+                this.SitecoreConfiguration.MainSiteConfigurationItem = mainSiteConfiguration;
             }
 
-            SitecoreConfiguration.SearchEngines = !String.IsNullOrEmpty(globalConfigurationItem["Search Engines"])
+            this.SitecoreConfiguration.SearchEngines = !String.IsNullOrEmpty(globalConfigurationItem["Search Engines"])
                 ? globalConfigurationItem["Search Engines"].Split('|').ToList()
                 : new List<String>();
 
-            SitecoreConfiguration.ProcessedLanguages = new List<String>();
+            this.SitecoreConfiguration.ProcessedLanguages = new List<String>();
 
             if (!String.IsNullOrEmpty(globalConfigurationItem["Processed languages"]))
             {
@@ -210,11 +216,11 @@ protected void ReadGlobalSitecoreConfiguration()
 
                 foreach (var itemId in itemIds)
                 {
-                    var item = Database.GetItem(itemId);
+                    var item = this.Database.GetItem(itemId);
 
                     if (item != null)
                     {
-                        SitecoreConfiguration.ProcessedLanguages.Add(item.Name);
+                        this.SitecoreConfiguration.ProcessedLanguages.Add(item.Name);
                     }
                 }
             }
@@ -225,11 +231,11 @@ protected void ReadGlobalSitecoreConfiguration()
         /// </summary>
         protected void GenerateSitemaps()
         {
-            foreach (var sitemapSiteConfiguration in SiteConfigurations)
+            foreach (var sitemapSiteConfiguration in this.SiteConfigurations)
             {
-                var sitemapContent = BuildSitemap(sitemapSiteConfiguration);
+                var sitemapContent = this.BuildSitemap(sitemapSiteConfiguration);
 
-                string path = Sitecore.MainUtil.MapPath(sitemapSiteConfiguration.SitemapFilePath);
+                string path = FileUtil.MapPath(null, sitemapSiteConfiguration.SitemapFilePath);
 
                 StreamWriter streamWriter = new StreamWriter(path, false);
                 streamWriter.Write(sitemapContent);
@@ -246,13 +252,13 @@ public String BuildSitemap(SitemapSiteConfiguration sitemapSiteConfiguration)
         {
             var result = String.Empty;
 
-            var options = GetUrlOptions();
+            var options = this.GetUrlOptions();
 
             var encoding = Encoding.UTF8;
             StringWriterWithEncoding stringWriter = new StringWriterWithEncoding(encoding);
 
             // - Creating the XML Header -
-           
+
             var xml = new XmlTextWriter(stringWriter);
             xml.WriteStartDocument();
             xml.WriteStartElement("urlset", DynamicSitemapConfiguration.XmlnsTpl);
@@ -262,14 +268,14 @@ public String BuildSitemap(SitemapSiteConfiguration sitemapSiteConfiguration)
                 options.Site = sitemapSiteConfiguration.Site;
                 options.Language = sitemapSiteConfiguration.Language;
 
-                List<Item> items = GetItems(sitemapSiteConfiguration.Site.RootPath, sitemapSiteConfiguration.Language);
-                
-                ProcessItems(items, sitemapSiteConfiguration, options, xml);
+                List<Item> items = this.GetItems(sitemapSiteConfiguration.Site.RootPath, sitemapSiteConfiguration.Language);
+
+                this.ProcessItems(items, sitemapSiteConfiguration, options, xml);
             }
 
             catch (Exception exc)
             {
-                Sitecore.Diagnostics.Log.Error(String.Format(Messages.ExceptionWhileBuilding, sitemapSiteConfiguration.Site.Name, exc.Message, exc.StackTrace) , this);
+                Diagnostics.Log.Error(String.Format(Messages.ExceptionWhileBuilding, sitemapSiteConfiguration.Site.Name, exc.Message, exc.StackTrace), this);
             }
 
             finally
@@ -280,7 +286,7 @@ public String BuildSitemap(SitemapSiteConfiguration sitemapSiteConfiguration)
 
                 result = stringWriter.ToString();
 
-                Sitecore.Diagnostics.Log.Info(String.Format(Messages.SitemapBuidSuccess, sitemapSiteConfiguration), this);
+                Diagnostics.Log.Info(String.Format(Messages.SitemapBuidSuccess, sitemapSiteConfiguration), this);
             }
 
             return result;
@@ -309,7 +315,7 @@ protected void GenerateSitemapsIndex()
 
             try
             {
-                foreach (var sitemap in SiteConfigurations)
+                foreach (var sitemap in this.SiteConfigurations)
                 {
                     xml.WriteStartElement("sitemap");
                     xml.WriteElementString("loc", sitemap.SitemapUrl);
@@ -325,7 +331,7 @@ protected void GenerateSitemapsIndex()
 
             catch (Exception exc)
             {
-                Sitecore.Diagnostics.Log.Error("DynamicSitemapGenerator: " + exc.Message + "\n\n" + exc.StackTrace, this);
+                Diagnostics.Log.Error("DynamicSitemapGenerator: " + exc.Message + "\n\n" + exc.StackTrace, this);
             }
 
             finally
@@ -335,14 +341,14 @@ protected void GenerateSitemapsIndex()
                 xml.Flush();
 
                 String result = stringWriter.ToString();
-                
-                string path = Sitecore.MainUtil.MapPath("/" + SitemapIndex.FileName);
+
+                string path = MainUtil.MapPath("/" + this.SitemapIndex.FileName);
 
                 StreamWriter streamWriter = new StreamWriter(path, false);
                 streamWriter.Write(result);
                 streamWriter.Close();
-                
-                Sitecore.Diagnostics.Log.Info("DynamicSitemapGenerator: Sitemap index generated - in path " + path + ", " + sitemapsCount + " sitemaps attached", this);
+
+                Diagnostics.Log.Info("DynamicSitemapGenerator: Sitemap index generated - in path " + path + ", " + sitemapsCount + " sitemaps attached", this);
             }
         }
 
@@ -359,17 +365,27 @@ protected List<Item> GetItems(String rootPath, Language language)
             using (new LanguageSwitcher(language.Name))
             {
                 // - Add root Item -
-                items.Add(Database.SelectSingleItem(rootPath));
+                var rootItem = this.Database.SelectSingleItem(rootPath);
+                if (rootItem == null)
+                {
+                    return new List<Item>();
+                }
 
-                items.AddRange(
-                    Database.SelectItems("fast:" + rootPath + "//*")
-                        .ToList()
-                );
+                items.Add(rootItem);
+                this.AppendItems(items, rootItem);
             }
-            
             return items;
         }
 
+        public void AppendItems(List<Item> itemList, Item item)
+        {
+            foreach (Item childItem in item.Children)
+            {
+                itemList.Add(childItem);
+                this.AppendItems(itemList, childItem);
+            }
+        }
+
         /// <summary>
         /// Processes all items in site under root path
         /// </summary>
@@ -379,16 +395,18 @@ protected List<Item> GetItems(String rootPath, Language language)
         /// <param name="xml">Xml Text Writer object</param>
         public void ProcessItems(List<Item> items, SitemapSiteConfiguration sitemapSiteConfiguration, UrlOptions options, XmlTextWriter xml)
         {
+            var templateCache = new Dictionary<Guid, bool>();
+
             foreach (var item in items)
             {
                 if (item.Versions.Count > 0)
                 {
                     if (DynamicSitemapHelper.IsWildcard(item))
                     {
-                        PrepareDynamicItems(item, sitemapSiteConfiguration, xml);
+                        this.PrepareDynamicItems(item, sitemapSiteConfiguration, xml, templateCache);
                     }
 
-                    else if (IsIncluded(item, sitemapSiteConfiguration))
+                    else if (this.IsIncluded(item, sitemapSiteConfiguration, templateCache))
                     {
                         var url = LinkManager.GetItemUrl(item, options);
                         url = DynamicSitemapHelper.EnsureHttpPrefix(url, sitemapSiteConfiguration.ForceHttps);
@@ -398,7 +416,7 @@ public void ProcessItems(List<Item> items, SitemapSiteConfiguration sitemapSiteC
                             url = DynamicSitemapHelper.ReplaceHost(url, sitemapSiteConfiguration.ServerHost);
                         }
 
-                        GenerateUrlElement(url, item, sitemapSiteConfiguration, xml);
+                        this.GenerateUrlElement(url, item, sitemapSiteConfiguration, xml);
                     }
                 }
             }
@@ -409,7 +427,7 @@ public void ProcessItems(List<Item> items, SitemapSiteConfiguration sitemapSiteC
 
                 foreach (var urlItem in urlItems)
                 {
-                    GenerateUrlElement(urlItem, sitemapSiteConfiguration, xml);
+                    this.GenerateUrlElement(urlItem, sitemapSiteConfiguration, xml);
                 }
             }
         }
@@ -420,24 +438,25 @@ public void ProcessItems(List<Item> items, SitemapSiteConfiguration sitemapSiteC
         /// <param name="wildcardItem">Wildcard Item</param>
         /// <param name="sitemapSiteConfiguration">Sitemap site configuration</param>
         /// <param name="xml">XmlTextWriter object</param>
-        protected void PrepareDynamicItems(Item wildcardItem, SitemapSiteConfiguration sitemapSiteConfiguration, XmlTextWriter xml)
+        /// <param name="templateCache"></param>
+        protected void PrepareDynamicItems(Item wildcardItem, SitemapSiteConfiguration sitemapSiteConfiguration, XmlTextWriter xml, Dictionary<Guid, bool> templateCache)
         {
             var dynamicRoute = sitemapSiteConfiguration.DynamicRoutes.SingleOrDefault(x => x["Dynamic Item"] == wildcardItem.ID.ToString());
 
             if (dynamicRoute != null)
             {
-                var datasource = Database.GetItem(dynamicRoute["Data Source"]);
+                var datasource = this.Database.GetItem(dynamicRoute["Data Source"]);
 
                 if (datasource != null && datasource.HasChildren)
                 {
-                    UrlOptions options = GetUrlOptions();
+                    UrlOptions options = this.GetUrlOptions();
                     options.Site = sitemapSiteConfiguration.Site;
 
                     var dynamicItemActualUrl = LinkManager.GetItemUrl(wildcardItem, options);
 
                     foreach (var item in datasource.Children.ToList())
                     {
-                        if (item.Versions.Count > 0 && IsIncluded(item, sitemapSiteConfiguration, true))
+                        if (item.Versions.Count > 0 && this.IsIncluded(item, sitemapSiteConfiguration, templateCache, true))
                         {
                             var lastSegment = item.Name;
                             lastSegment = options.LowercaseUrls ? lastSegment.ToLower() : lastSegment;
@@ -452,8 +471,8 @@ protected void PrepareDynamicItems(Item wildcardItem, SitemapSiteConfiguration s
                             {
                                 url = DynamicSitemapHelper.ReplaceHost(url, sitemapSiteConfiguration.ServerHost);
                             }
-                            
-                            GenerateUrlElement(url, item, sitemapSiteConfiguration, xml);
+
+                            this.GenerateUrlElement(url, item, sitemapSiteConfiguration, xml);
                         }
                     }
                 }
@@ -505,7 +524,7 @@ protected void GenerateUrlElement(String url, Item item, SitemapSiteConfiguratio
                     xml.WriteElementString("priority", priority);
                 }
             }
-            
+
             xml.WriteEndElement();
         }
 
@@ -515,16 +534,16 @@ protected void GenerateUrlElement(UrlElement urlElement, SitemapSiteConfiguratio
 
             xml.WriteStartElement("url");
             xml.WriteElementString("loc", urlElement.Location);
-            
+
             var lastModified = urlElement.LastModification.ToString("yyyy-MM-ddThh:mm:sszzz");
 
             xml.WriteElementString("lastmod", lastModified);
-            
+
             if (urlElement.ChangeFrequency != String.Empty)
             {
                 xml.WriteElementString("changefreq", urlElement.ChangeFrequency);
             }
-            
+
             if (urlElement.Priority != String.Empty)
             {
                 xml.WriteElementString("priority", urlElement.Priority);
@@ -537,37 +556,58 @@ protected void GenerateUrlElement(UrlElement urlElement, SitemapSiteConfiguratio
         /// Checks if Item can be included in sitemap
         /// </summary>
         /// <param name="item">Item</param>
+        /// <param name="sitemapSiteConfiguration"></param>
+        /// <param name="templateCache"></param>
         /// <param name="isDataSourceItem">Is item used only in wildcard</param>
         /// <returns>true if included</returns>
-        protected bool IsIncluded(Item item, SitemapSiteConfiguration sitemapSiteConfiguration, bool isDataSourceItem = false)
+        protected bool IsIncluded(Item item, SitemapSiteConfiguration sitemapSiteConfiguration, Dictionary<Guid, bool> templateCache, bool isDataSourceItem = false)
         {
-            var result = false;
-
-            if (!sitemapSiteConfiguration.ExcludedItems.Any(x => x == item.ID.ToString())
-                && sitemapSiteConfiguration.IncludedTemplates.Contains(item.TemplateID.ToString())
+            return sitemapSiteConfiguration.ExcludedItems.All(x => x != item.ID.ToString())
+                && this.MatchesTemplates(sitemapSiteConfiguration, item, templateCache)
                 && !sitemapSiteConfiguration.ExcludedItemPaths.Any(x => item.Paths.FullPath.StartsWith(x.Paths.FullPath) && item.Paths.FullPath.Equals(x.Paths.FullPath))
                 && (item.Paths.FullPath.StartsWith(sitemapSiteConfiguration.RootItem.Paths.FullPath)
                     || item.Paths.FullPath.Equals(sitemapSiteConfiguration.RootItem.Paths.FullPath)
-                    || isDataSourceItem)) // - datasource items can be out of root item
+                    || isDataSourceItem);
+        }
+
+        private bool MatchesTemplates(SitemapSiteConfiguration sitemapSiteConfiguration, Item item, Dictionary<Guid, bool> templateCache)
+        {
+            var templateId = item.TemplateID.Guid;
+            
+            if (templateCache.ContainsKey(templateId))
             {
-                result = true;
+                return templateCache[templateId];
             }
 
-            return result;
+            bool matchesTemplate;
+            if (sitemapSiteConfiguration.IncludedTemplates.Contains(templateId))
+            {
+                // matches the allowed templates
+                matchesTemplate = true;
+            }
+            else
+            {
+                // slow - need local caching
+                var baseTemplates = TemplateHelper.GetBaseTemplates(item);
+                matchesTemplate = sitemapSiteConfiguration.IncludedBaseTemplates.Any(guid => baseTemplates.Contains(guid));
+            }
+
+            templateCache.Add(templateId, matchesTemplate);
+            return matchesTemplate;
         }
-        
+
         /// <summary>
         /// Ensures that sitemaps directory exists
         /// </summary>
         protected static void EnsureSitemapsDirectoryExists()
         {
-            String dirPath = Sitecore.MainUtil.MapPath(DynamicSitemapConfiguration.SitemapConfigurationOutputFolder + "/");
+            String dirPath = MainUtil.MapPath(DynamicSitemapConfiguration.SitemapConfigurationOutputFolder + "/");
             if (!Directory.Exists(dirPath))
             {
                 Directory.CreateDirectory(dirPath);
             }
         }
-        
+
         /// <summary>
         /// Registers sitemaps to robots.txt
         /// </summary>
@@ -592,12 +632,12 @@ public void RegisterSitemapToRobotsFile()
 
                 if (DynamicSitemapConfiguration.UseSitemapsIndexFile)
                 {
-                    sitemapUrls.Add(SitemapIndex.Url);
+                    sitemapUrls.Add(this.SitemapIndex.Url);
                 }
 
                 else
                 {
-                    sitemapUrls.AddRange(SiteConfigurations.Select(x => x.SitemapUrl));
+                    sitemapUrls.AddRange(this.SiteConfigurations.Select(x => x.SitemapUrl));
                 }
 
                 foreach (var url in sitemapUrls)
diff --git a/Sitecore.SharedSource.DynamicSitemap/DynamicSitemapManagerForm.cs b/Sitecore.SharedSource.DynamicSitemap/DynamicSitemapManagerForm.cs
index b057f73..73948a1 100644
--- a/Sitecore.SharedSource.DynamicSitemap/DynamicSitemapManagerForm.cs
+++ b/Sitecore.SharedSource.DynamicSitemap/DynamicSitemapManagerForm.cs
@@ -2,6 +2,7 @@
 using Sitecore.SharedSource.DynamicSitemap.Configuration;
 using Sitecore.Web.UI.HtmlControls;
 using Sitecore.Web.UI.Sheer;
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -32,7 +33,7 @@ public class DynamicSitemapManagerForm : BaseForm
         protected override void OnLoad(EventArgs e)
         {
             base.OnLoad(e);
-            
+
             this.RefreshButton.Click = "RefreshButtonClick";
 
             Border border = Context.ClientPage.FindControl("Content") as Border;
@@ -43,20 +44,24 @@ protected override void OnLoad(EventArgs e)
             foreach (var config in dynamicSitemapGenerator.SiteConfigurations)
             {
                 var newBorder = new Border()
-                {
-                    Border = "1px solid #d9d9d9",
-                    Padding = "5px 15px",
-                    Margin = "0 0 2px 0"
-                };
+                                    {
+                                        Border = "1px solid #d9d9d9",
+                                        Padding = "5px 15px",
+                                        Margin = "0 0 2px 0"
+                                    };
 
                 var literal = new Border()
-                {
-                    InnerHtml = String.Format("Site name: <strong>{0}</strong>, Language: <strong>{1}</strong>", config.Site.Name, config.LanguageName),
-                    Width = 200,
-                    //Float = "left",
-                    Padding = "10px 0px;"
-                };
-                    
+                                  {
+                                      InnerHtml =
+                                          String.Format(
+                                              "Site name: <strong>{0}</strong>, Language: <strong>{1}</strong>",
+                                              config.Site.Name,
+                                              config.LanguageName),
+                                      Width = 200,
+                                      //Float = "left",
+                                      Padding = "10px 0px;"
+                                  };
+
                 newBorder.Controls.Add(literal);
 
                 border.Controls.Add(newBorder);
@@ -77,7 +82,9 @@ public void RefreshButtonClick()
 
             if (dynamicSitemapGenerator.SiteConfigurations == null || !dynamicSitemapGenerator.SiteConfigurations.Any())
             {
-                this.Message.Text = "No sitemap configurations found under " + DynamicSitemapConfiguration.SitemapConfigurationItemPath + ". Please create one or more configuration nodes and try refreshing again.";
+                this.Message.Text = "No sitemap configurations found under "
+                                    + DynamicSitemapConfiguration.SitemapConfigurationItemPath
+                                    + ". Please create one or more configuration nodes and try refreshing again.";
                 DynamicSitemapManagerForm.RefreshPanel("MainPanel");
             }
 
@@ -89,7 +96,7 @@ public void RefreshButtonClick()
                 {
                     message += String.Format("<li> &bull; {0}</li>", configuration);
                 }
-                
+
                 message += "</ul>";
 
                 this.Message.Text = message;
@@ -108,4 +115,4 @@ private static void RefreshPanel(String panelName)
             Context.ClientPage.ClientResponse.Refresh(panel);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Sitecore.SharedSource.DynamicSitemap/Extensions/StringExtensions.cs b/Sitecore.SharedSource.DynamicSitemap/Extensions/StringExtensions.cs
index effe211..8f01182 100644
--- a/Sitecore.SharedSource.DynamicSitemap/Extensions/StringExtensions.cs
+++ b/Sitecore.SharedSource.DynamicSitemap/Extensions/StringExtensions.cs
@@ -28,4 +28,4 @@ public static string ReplaceFirst(this string text, string search, string replac
             return text.Substring(0, pos) + replace + text.Substring(pos + search.Length);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Sitecore.SharedSource.DynamicSitemap/Extensions/StringWriterWithEncoding.cs b/Sitecore.SharedSource.DynamicSitemap/Extensions/StringWriterWithEncoding.cs
index 2cb526d..c1047ff 100644
--- a/Sitecore.SharedSource.DynamicSitemap/Extensions/StringWriterWithEncoding.cs
+++ b/Sitecore.SharedSource.DynamicSitemap/Extensions/StringWriterWithEncoding.cs
@@ -17,7 +17,10 @@ public StringWriterWithEncoding(Encoding encoding)
 
         public override Encoding Encoding
         {
-            get { return encoding; }
+            get
+            {
+                return encoding;
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Sitecore.SharedSource.DynamicSitemap/Helpers/DynamicSitemapHelper.cs b/Sitecore.SharedSource.DynamicSitemap/Helpers/DynamicSitemapHelper.cs
index cf158bf..19522d0 100644
--- a/Sitecore.SharedSource.DynamicSitemap/Helpers/DynamicSitemapHelper.cs
+++ b/Sitecore.SharedSource.DynamicSitemap/Helpers/DynamicSitemapHelper.cs
@@ -1,5 +1,6 @@
 using Sitecore.Data.Items;
 using Sitecore.SharedSource.DynamicSitemap.Extensions;
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -26,8 +27,8 @@ public static String ReplaceHost(string url, string serverHost)
             UriBuilder builder = new UriBuilder(uri);
 
             serverHost = serverHost.Replace("http://", String.Empty)
-                                   .Replace("https://", String.Empty)
-                                   .Replace("/", String.Empty);
+                .Replace("https://", String.Empty)
+                .Replace("/", String.Empty);
 
             builder.Host = serverHost;
 
@@ -56,12 +57,13 @@ public static bool IsWildcard(Item item)
         /// <returns></returns>
         public static String EnsureHttpPrefix(String url, bool useHttps = false)
         {
-            if (!url.StartsWith("http") && !url.StartsWith("https"))
+            
+            if (!url.StartsWith("http://") && !url.StartsWith("https://"))
             {
-                url = (useHttps ? "https" : "http") + url;
+                url = (useHttps ? "https://" : "http://") + url;
             }
 
-            else if (url.StartsWith("http") && useHttps)
+            if (!url.StartsWith("https") && useHttps)
             {
                 url = url.ReplaceFirst("http", "https");
             }
@@ -78,12 +80,18 @@ public static bool IsPage(Item item)
         {
             var result = false;
             var layoutField = new Data.Fields.LayoutField(item.Fields[FieldIDs.LayoutField]);
-            if (!layoutField.InnerField.HasValue || string.IsNullOrEmpty(layoutField.Value)) return false;
+            if (!layoutField.InnerField.HasValue || string.IsNullOrEmpty(layoutField.Value))
+            {
+                return false;
+            }
             var layout = Layouts.LayoutDefinition.Parse(layoutField.Value);
             foreach (var deviceObj in layout.Devices)
             {
                 var device = deviceObj as Layouts.DeviceDefinition;
-                if (device == null) return false;
+                if (device == null)
+                {
+                    return false;
+                }
                 if (device.Renderings.Count > 0)
                 {
                     result = true;
@@ -92,4 +100,4 @@ public static bool IsPage(Item item)
             return result;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Sitecore.SharedSource.DynamicSitemap/Interfaces/IItemsProcessor.cs b/Sitecore.SharedSource.DynamicSitemap/Interfaces/IItemsProcessor.cs
index 196a23b..fc70a81 100644
--- a/Sitecore.SharedSource.DynamicSitemap/Interfaces/IItemsProcessor.cs
+++ b/Sitecore.SharedSource.DynamicSitemap/Interfaces/IItemsProcessor.cs
@@ -1,4 +1,5 @@
 using Sitecore.SharedSource.DynamicSitemap.Model;
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -11,4 +12,4 @@ public interface IItemsProcessor
     {
         List<UrlElement> ProcessItems(SitemapSiteConfiguration sitemapSiteConfiguration);
     }
-}
+}
\ No newline at end of file
diff --git a/Sitecore.SharedSource.DynamicSitemap/Logic/SitemapSubmitter.cs b/Sitecore.SharedSource.DynamicSitemap/Logic/SitemapSubmitter.cs
index e2d5c3b..cc63fa1 100644
--- a/Sitecore.SharedSource.DynamicSitemap/Logic/SitemapSubmitter.cs
+++ b/Sitecore.SharedSource.DynamicSitemap/Logic/SitemapSubmitter.cs
@@ -3,6 +3,7 @@
 using Sitecore.SharedSource.DynamicSitemap.Configuration;
 using Sitecore.SharedSource.DynamicSitemap.Constants;
 using Sitecore.SharedSource.DynamicSitemap.Model;
+
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -31,7 +32,7 @@ public class SitemapSubmitter
         /// Site configurations list
         /// </summary>
         protected List<SitemapSiteConfiguration> SiteConfigurations { get; set; }
-        
+
         /// <summary>
         /// Sitemap index
         /// </summary>
@@ -39,7 +40,10 @@ public class SitemapSubmitter
 
         protected List<SubmissionUrlsConfig> SubmissionUrlsConfig { get; set; }
 
-        public SitemapSubmitter(DynamicSitemapSitecoreConfiguration config, List<SitemapSiteConfiguration> siteConfigurations, Database database)
+        public SitemapSubmitter(
+            DynamicSitemapSitecoreConfiguration config,
+            List<SitemapSiteConfiguration> siteConfigurations,
+            Database database)
         {
             SitecoreConfiguration = config;
             SiteConfigurations = siteConfigurations;
@@ -133,15 +137,22 @@ protected void SubmitEngine(string engine, string sitemapUrl)
 
                     if (httpWebResponse.StatusCode != HttpStatusCode.OK)
                     {
-                        Diagnostics.Log.Error(String.Format(Messages.SitemapSubmitterCannotSubmit, engine, httpWebResponse.StatusDescription), this);
+                        Diagnostics.Log.Error(
+                            String.Format(
+                                Messages.SitemapSubmitterCannotSubmit,
+                                engine,
+                                httpWebResponse.StatusDescription),
+                            this);
                     }
                 }
 
                 catch (Exception exc)
                 {
-                    Diagnostics.Log.Warn(String.Format(Messages.SitemapSubmitterExceptionWhileSubmit, text, exc.Message, exc.StackTrace), this);
+                    Diagnostics.Log.Warn(
+                        String.Format(Messages.SitemapSubmitterExceptionWhileSubmit, text, exc.Message, exc.StackTrace),
+                        this);
                 }
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Sitecore.SharedSource.DynamicSitemap/Model/DynamicSitemapSitecoreConfiguration.cs b/Sitecore.SharedSource.DynamicSitemap/Model/DynamicSitemapSitecoreConfiguration.cs
index 8441893..da36eeb 100644
--- a/Sitecore.SharedSource.DynamicSitemap/Model/DynamicSitemapSitecoreConfiguration.cs
+++ b/Sitecore.SharedSource.DynamicSitemap/Model/DynamicSitemapSitecoreConfiguration.cs
@@ -1,4 +1,5 @@
 using Sitecore.Data.Items;
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -32,4 +33,4 @@ public class DynamicSitemapSitecoreConfiguration
         /// </summary>
         public List<String> ProcessedLanguages { get; set; }
     }
-}
+}
\ No newline at end of file
diff --git a/Sitecore.SharedSource.DynamicSitemap/Model/SitemapIndexConfiguration.cs b/Sitecore.SharedSource.DynamicSitemap/Model/SitemapIndexConfiguration.cs
index 31bbe9d..7ca2c40 100644
--- a/Sitecore.SharedSource.DynamicSitemap/Model/SitemapIndexConfiguration.cs
+++ b/Sitecore.SharedSource.DynamicSitemap/Model/SitemapIndexConfiguration.cs
@@ -1,4 +1,5 @@
 using Sitecore.Links;
+using Sitecore.SharedSource.DynamicSitemap.Helpers;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -17,6 +18,11 @@ public class SitemapIndexConfiguration
         /// </summary>
         public string ServerHost { get; set; }
 
+        /// <summary>
+        /// Forces generating https urls
+        /// </summary>
+        public bool ForceHttps { get; set; }
+
         /// <summary>
         /// Sitemap index file name
         /// </summary>
@@ -29,15 +35,16 @@ public String Url
         {
             get
             {
-                var url = ServerHost;
-                
-                url = !url.StartsWith("http://") ? "http://" + url : url;
+                var url = !string.IsNullOrEmpty(ServerHost) ? ServerHost : TargetHostName;
 
                 url = Sitecore.StringUtil.EnsurePostfix('/', url);
-                url += FileName;
+                url += FileName;    
+                url = DynamicSitemapHelper.EnsureHttpPrefix(url, ForceHttps);
 
                 return url;
             }
         }
+
+        public string TargetHostName { get; set; }
     }
-}
+}
\ No newline at end of file
diff --git a/Sitecore.SharedSource.DynamicSitemap/Model/SitemapSiteConfiguration.cs b/Sitecore.SharedSource.DynamicSitemap/Model/SitemapSiteConfiguration.cs
index 2a9e979..4852e8a 100644
--- a/Sitecore.SharedSource.DynamicSitemap/Model/SitemapSiteConfiguration.cs
+++ b/Sitecore.SharedSource.DynamicSitemap/Model/SitemapSiteConfiguration.cs
@@ -4,12 +4,16 @@
 using Sitecore.SharedSource.DynamicSitemap.Configuration;
 using Sitecore.SharedSource.DynamicSitemap.Constants;
 using Sitecore.SharedSource.DynamicSitemap.Interfaces;
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Sitecore.SharedSource.DynamicSitemap.Helpers;
 
 namespace Sitecore.SharedSource.DynamicSitemap.Model
 {
+    using static System.String;
+
     /// <summary>
     /// Sitemap Site Configuration
     /// </summary>
@@ -28,12 +32,17 @@ public class SitemapSiteConfiguration
         /// <summary>
         /// Excluded paths
         /// </summary>
-        public List<String> ExcludedPaths { get; private set; }
+        public List<string> ExcludedPaths { get; private set; }
+
+        /// <summary>
+        /// Included templates
+        /// </summary>
+        public List<Guid> IncludedTemplates { get; private set; }
 
         /// <summary>
         /// Included templates
         /// </summary>
-        public List<string> IncludedTemplates { get; private set; }
+        public List<Guid> IncludedBaseTemplates { get; private set; }
 
         /// <summary>
         /// Excluded Item paths
@@ -43,7 +52,7 @@ public class SitemapSiteConfiguration
         /// <summary>
         /// Search engines
         /// </summary>
-        public List<String> SearchEngines { get; private set; }
+        public List<string> SearchEngines { get; private set; }
 
         /// <summary>
         /// Root Item ID
@@ -68,63 +77,63 @@ public class SitemapSiteConfiguration
         /// <summary>
         /// Configuration Language
         /// </summary>
-        public String LanguageName
+        public string LanguageName
         {
             get
             {
-                return Language != null ? Language.Name : String.Empty;
+                return Language != null ? Language.Name : Empty;
             }
         }
 
         /// <summary>
         /// Sitemap file name
         /// </summary>
-        public String SitemapFileName { get; set; }
+        public string SitemapFileName { get; set; }
 
         /// <summary>
         /// Sitemap file path
         /// </summary>
-        public String SitemapFilePath { get; set; }
+        public string SitemapFilePath { get; set; }
 
         /// <summary>
         /// Forces generating https urls
         /// </summary>
-        public Boolean ForceHttps { get; set; }
+        public bool ForceHttps { get; set; }
 
         /// <summary>
         /// Change frequencies for templates
         /// </summary>
-        public Dictionary<String, String> ChangeFrequenciesForTemplates { get; set; }
+        public Dictionary<string, string> ChangeFrequenciesForTemplates { get; set; }
 
         /// <summary>
         /// Change frequencies for items
         /// </summary>
-        public Dictionary<String, String> ChangeFrequenciesForItems { get; set; }
+        public Dictionary<string, string> ChangeFrequenciesForItems { get; set; }
 
         /// <summary>
         /// Change frequency default value
         /// </summary>
-        public String ChangeFrequencyDefaultValue { get; private set; }
+        public string ChangeFrequencyDefaultValue { get; private set; }
 
         /// <summary>
         /// Priorities for templates
         /// </summary>
-        public Dictionary<String, String> PrioritiesForTemplates { get; set; }
+        public Dictionary<string, string> PrioritiesForTemplates { get; set; }
 
         /// <summary>
         /// Priorities for items
         /// </summary>
-        public Dictionary<String, String> PrioritiesForItems { get; set; }
+        public Dictionary<string, string> PrioritiesForItems { get; set; }
 
         /// <summary>
         /// Priority default value
         /// </summary>
-        public String PriorityDefaultValue { get; private set; }
+        public string PriorityDefaultValue { get; private set; }
 
         /// <summary>
         /// Items processor type to load
         /// </summary>
-        public String ItemsProcessorTypeToLoad { get; private set; }
+        public string ItemsProcessorTypeToLoad { get; private set; }
 
         /// <summary>
         /// Items processor 
@@ -139,39 +148,41 @@ public String LanguageName
         /// <summary>
         /// Sitemap
         /// </summary>
-        public String SitemapUrl
+        public string SitemapUrl
+        {
+            get
+            {
+                var url = TargetHost;
+                url += SitemapFilePath.Replace("//", "/");                
+
+                return url;
+            }
+        }
+
+        public string TargetHost
         {
             get
             {
-                var url = String.Empty;
+                var url = Empty;
 
-                if (Site.HostName == String.Empty)
+                if (Site.TargetHostName == Empty)
                 {
                     Sitecore.Links.UrlOptions urlOptions = Sitecore.Links.UrlOptions.DefaultOptions;
                     urlOptions.LanguageEmbedding = LanguageEmbedding.Never;
                     urlOptions.SiteResolving = true;
                     urlOptions.Site = Site;
                     urlOptions.AlwaysIncludeServerUrl = true;
-                    
+
                     var startItem = _configurationItem.Database.GetItem(Site.ContentStartPath);
 
                     url = Sitecore.Links.LinkManager.GetItemUrl(startItem, urlOptions);
                 }
-
                 else
                 {
-                    url = !String.IsNullOrEmpty(ServerHost)
-                        ? ServerHost
-                        : Site.HostName;
+                    url = !IsNullOrEmpty(ServerHost) ? ServerHost : Site.TargetHostName + '/';
                 }
 
-                url = url.Replace("//", "/");
-                url = !url.StartsWith("http://") 
-                    ? "http://" + url 
-                    : url;
-                
-                url += SitemapFilePath.Replace("//", "/");
-
+                url = DynamicSitemapHelper.EnsureHttpPrefix(url, ForceHttps);
                 return url;
             }
         }
@@ -196,21 +207,25 @@ public SitemapSiteConfiguration(Item configurationItem)
 
             ServerHost = configurationItem["Server Host"];
 
-            IncludedTemplates = !String.IsNullOrEmpty(configurationItem["Included Templates"])
-                ? configurationItem["Included Templates"].Split('|').ToList()
-                : new List<String>();
+            IncludedBaseTemplates = !IsNullOrEmpty(configurationItem["Included Base Templates"])
+                                    ? configurationItem["Included Base Templates"].Split('|').Select(Guid.Parse).ToList()
+                                    : new List<Guid>();
+
+            IncludedTemplates = !IsNullOrEmpty(configurationItem["Included Templates"])
+                                    ? configurationItem["Included Templates"].Split('|').Select(Guid.Parse).ToList()
+                                    : new List<Guid>();
 
-            ExcludedItems = !String.IsNullOrEmpty(configurationItem["Excluded Items"])
-                ? configurationItem["Excluded Items"].Split('|').ToList()
-                : new List<String>();
+            ExcludedItems = !IsNullOrEmpty(configurationItem["Excluded Items"])
+                                ? configurationItem["Excluded Items"].Split('|').ToList()
+                                : new List<string>();
 
-            ExcludedPaths = !String.IsNullOrEmpty(configurationItem["Excluded Paths"])
-                ? configurationItem["Excluded Paths"].Split('|').ToList()
-                : new List<String>();
+            ExcludedPaths = !IsNullOrEmpty(configurationItem["Excluded Paths"])
+                                ? configurationItem["Excluded Paths"].Split('|').ToList()
+                                : new List<string>();
 
-            SearchEngines = !String.IsNullOrEmpty(configurationItem["Search Engines"])
-                ? configurationItem["Search Engines"].Split('|').ToList()
-                : new List<String>();
+            SearchEngines = !IsNullOrEmpty(configurationItem["Search Engines"])
+                                ? configurationItem["Search Engines"].Split('|').ToList()
+                                : new List<string>();
 
             ExcludedItemPaths = new List<Item>();
 
@@ -242,11 +257,14 @@ public SitemapSiteConfiguration(Item configurationItem)
         private void ReadPriorities()
         {
             PriorityDefaultValue = _configurationItem["Default Priority"];
-            
-            PrioritiesForTemplates = new Dictionary<String, String>();
-            PrioritiesForItems = new Dictionary<String, String>();
 
-            Item prioritiesFolder = _configurationItem.Database.GetItem(_configurationItem.Paths.FullPath + "/" + DynamicSitemapConfiguration.SitemapConfigurationPrioritiesFolderName);
+            PrioritiesForTemplates = new Dictionary<string, string>();
+            PrioritiesForItems = new Dictionary<string, string>();
+
+            Item prioritiesFolder =
+                _configurationItem.Database.GetItem(
+                    _configurationItem.Paths.FullPath + "/"
+                    + DynamicSitemapConfiguration.SitemapConfigurationPrioritiesFolderName);
 
             if (prioritiesFolder != null && prioritiesFolder.HasChildren)
             {
@@ -254,12 +272,12 @@ private void ReadPriorities()
                 {
                     if (item.TemplateID.ToString() == TemplateIds.PriorityForTemplatesTemplateId)
                     {
-                        if (item["Templates"] != String.Empty && item["Priority"] != String.Empty)
+                        if (item["Templates"] != Empty && item["Priority"] != Empty)
                         {
                             var elements = item["Templates"].Split('|').ToList();
                             var priority = item["Priority"];
 
-                            if (priority != String.Empty)
+                            if (priority != Empty)
                             {
                                 foreach (var element in elements)
                                 {
@@ -271,12 +289,12 @@ private void ReadPriorities()
 
                     else if (item.TemplateID.ToString() == TemplateIds.PriorityForItemsTemplateId)
                     {
-                        if (item["Items"] != String.Empty && item["Priority"] != String.Empty)
+                        if (item["Items"] != Empty && item["Priority"] != Empty)
                         {
                             var elements = item["Items"].Split('|').ToList();
                             var priority = item["Priority"];
 
-                            if (priority != String.Empty)
+                            if (priority != Empty)
                             {
                                 foreach (var element in elements)
                                 {
@@ -296,14 +314,17 @@ private void ReadChangeFrequencies()
         {
             var defaultChangeFrequency = _configurationItem.Database.GetItem(_configurationItem["Change Frequency"]);
 
-            ChangeFrequencyDefaultValue = defaultChangeFrequency != null && defaultChangeFrequency["Value"] != String.Empty
-                ? defaultChangeFrequency["Value"]
-                : String.Empty;
+            ChangeFrequencyDefaultValue = defaultChangeFrequency != null && defaultChangeFrequency["Value"] != Empty
+                                              ? defaultChangeFrequency["Value"]
+                                              : Empty;
 
-            ChangeFrequenciesForTemplates = new Dictionary<String, String>();
-            ChangeFrequenciesForItems = new Dictionary<String, String>();
+            ChangeFrequenciesForTemplates = new Dictionary<string, string>();
+            ChangeFrequenciesForItems = new Dictionary<string, string>();
 
-            Item changeFrequencyFolder = _configurationItem.Database.GetItem(_configurationItem.Paths.FullPath + "/" + DynamicSitemapConfiguration.SitemapConfigurationChangeFrequenciesFolderName);
+            Item changeFrequencyFolder =
+                _configurationItem.Database.GetItem(
+                    _configurationItem.Paths.FullPath + "/"
+                    + DynamicSitemapConfiguration.SitemapConfigurationChangeFrequenciesFolderName);
 
             if (changeFrequencyFolder != null && changeFrequencyFolder.HasChildren)
             {
@@ -311,7 +332,7 @@ private void ReadChangeFrequencies()
                 {
                     if (item.TemplateID.ToString() == TemplateIds.ChangeFrequencyForTemplatesTemplateId)
                     {
-                        if (item["Templates"] != String.Empty && item["Change Frequency"] != String.Empty)
+                        if (item["Templates"] != Empty && item["Change Frequency"] != Empty)
                         {
                             var elements = item["Templates"].Split('|').ToList();
                             var changeFrequency = _configurationItem.Database.GetItem(item["Change Frequency"]);
@@ -330,7 +351,7 @@ private void ReadChangeFrequencies()
 
                     else if (item.TemplateID.ToString() == TemplateIds.ChangeFrequencyForItemsTemplateId)
                     {
-                        if (item["Items"] != String.Empty && item["Change Frequency"] != String.Empty)
+                        if (item["Items"] != Empty && item["Change Frequency"] != Empty)
                         {
                             var elements = item["Items"].Split('|').ToList();
                             var changeFrequency = _configurationItem.Database.GetItem(item["Change Frequency"]);
@@ -356,8 +377,11 @@ private void ReadChangeFrequencies()
         protected void ReadDynamicRoutes()
         {
             DynamicRoutes = new List<Item>();
-            
-            Item dynamicRoutesFolder = _configurationItem.Database.GetItem(_configurationItem.Paths.FullPath + "/" + DynamicSitemapConfiguration.SitemapConfigurationRoutesFolderName);
+
+            Item dynamicRoutesFolder =
+                _configurationItem.Database.GetItem(
+                    _configurationItem.Paths.FullPath + "/"
+                    + DynamicSitemapConfiguration.SitemapConfigurationRoutesFolderName);
 
             if (dynamicRoutesFolder != null && dynamicRoutesFolder.HasChildren)
             {
@@ -374,7 +398,8 @@ protected void ReadDynamicRoutes()
         /// <returns>String</returns>
         public override string ToString()
         {
-            return "Sitemap configuration for site '" + Site.Name + "' (language " + Language.Name  + ") - generated as " + SitemapFilePath + " (items count: " + ItemsCount + ")";
+            return "Sitemap configuration for site '" + Site.Name + "' (language " + Language.Name + ") - generated as "
+                   + SitemapFilePath + " (items count: " + ItemsCount + ")";
         }
 
         /// <summary>
@@ -382,9 +407,9 @@ public override string ToString()
         /// </summary>
         /// <param name="item">Sitecore Item</param>
         /// <returns>Change frequency value</returns>
-        public String GetChangeFrequency(Item item)
+        public string GetChangeFrequency(Item item)
         {
-            String result = String.Empty;
+            string result = Empty;
 
             if (!ChangeFrequenciesForItems.TryGetValue(item.ID.ToString(), out result))
             {
@@ -402,9 +427,9 @@ public String GetChangeFrequency(Item item)
         /// </summary>
         /// <param name="item">Sitecore Item</param>
         /// <returns>Priority value</returns>
-        public String GetPriority(Item item)
+        public string GetPriority(Item item)
         {
-            String result = String.Empty;
+            string result = Empty;
 
             if (!PrioritiesForItems.TryGetValue(item.ID.ToString(), out result))
             {
@@ -417,4 +442,4 @@ public String GetPriority(Item item)
             return result;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Sitecore.SharedSource.DynamicSitemap/Model/SubmissionUrlsConfig.cs b/Sitecore.SharedSource.DynamicSitemap/Model/SubmissionUrlsConfig.cs
index 81127b1..a2fbdcd 100644
--- a/Sitecore.SharedSource.DynamicSitemap/Model/SubmissionUrlsConfig.cs
+++ b/Sitecore.SharedSource.DynamicSitemap/Model/SubmissionUrlsConfig.cs
@@ -18,4 +18,4 @@ public SubmissionUrlsConfig()
             SearchEngines = new List<String>();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Sitecore.SharedSource.DynamicSitemap/Model/UrlElement.cs b/Sitecore.SharedSource.DynamicSitemap/Model/UrlElement.cs
index 217a315..2cd8d3a 100644
--- a/Sitecore.SharedSource.DynamicSitemap/Model/UrlElement.cs
+++ b/Sitecore.SharedSource.DynamicSitemap/Model/UrlElement.cs
@@ -19,4 +19,4 @@ public class UrlElement
 
         public String Priority { get; set; }
     }
-}
+}
\ No newline at end of file
diff --git a/Sitecore.SharedSource.DynamicSitemap/Modules/ItemsProcessorLoader.cs b/Sitecore.SharedSource.DynamicSitemap/Modules/ItemsProcessorLoader.cs
index 9695b34..8a98a28 100644
--- a/Sitecore.SharedSource.DynamicSitemap/Modules/ItemsProcessorLoader.cs
+++ b/Sitecore.SharedSource.DynamicSitemap/Modules/ItemsProcessorLoader.cs
@@ -1,4 +1,5 @@
 using Sitecore.SharedSource.DynamicSitemap.Interfaces;
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -40,11 +41,10 @@ public IItemsProcessor Load(String assemblyDeclaration)
 
             catch (Exception e)
             {
-
                 throw;
             }
 
             return itemsProcessor;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Sitecore.SharedSource.DynamicSitemap/Properties/AssemblyInfo.cs b/Sitecore.SharedSource.DynamicSitemap/Properties/AssemblyInfo.cs
index 08896b0..85282d2 100644
--- a/Sitecore.SharedSource.DynamicSitemap/Properties/AssemblyInfo.cs
+++ b/Sitecore.SharedSource.DynamicSitemap/Properties/AssemblyInfo.cs
@@ -5,6 +5,7 @@
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
+
 [assembly: AssemblyTitle("Sitecore.SharedSource.DynamicSitemap")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
@@ -17,9 +18,11 @@
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
+
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
+
 [assembly: Guid("57a4efdd-889f-47cf-a47b-b65f813cb234")]
 
 // Version information for an assembly consists of the following four values:
@@ -32,5 +35,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
+
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file
diff --git a/Sitecore.SharedSource.DynamicSitemap/Sitecore.SharedSource.DynamicSitemap.csproj b/Sitecore.SharedSource.DynamicSitemap/Sitecore.SharedSource.DynamicSitemap.csproj
index 3ff0b90..83ca1bf 100644
--- a/Sitecore.SharedSource.DynamicSitemap/Sitecore.SharedSource.DynamicSitemap.csproj
+++ b/Sitecore.SharedSource.DynamicSitemap/Sitecore.SharedSource.DynamicSitemap.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sitecore.SharedSource.DynamicSitemap</RootNamespace>
     <AssemblyName>Sitecore.SharedSource.DynamicSitemap</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -31,8 +31,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Sitecore.Kernel">
-      <HintPath>..\Libraries\Sitecore.Kernel.dll</HintPath>
+    <Reference Include="Sitecore.Kernel, Version=10.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Sitecore.Kernel.NoReferences.8.2.160729\lib\NET452\Sitecore.Kernel.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -62,11 +63,13 @@
     <Compile Include="Modules\ItemsProcessorLoader.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Model\SitemapSiteConfiguration.cs" />
+    <Compile Include="TemplateHelper.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App_Config\Include\Sitecore.SharedSource.DynamicSitemap.config">
       <SubType>Designer</SubType>
     </None>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="sitecore modules\Shell\Dynamic Sitemap XML\DynamicSitemapManager.xml">
diff --git a/Sitecore.SharedSource.DynamicSitemap/TemplateHelper.cs b/Sitecore.SharedSource.DynamicSitemap/TemplateHelper.cs
new file mode 100644
index 0000000..4d29042
--- /dev/null
+++ b/Sitecore.SharedSource.DynamicSitemap/TemplateHelper.cs
@@ -0,0 +1,31 @@
+namespace Sitecore.SharedSource.DynamicSitemap
+{
+    using System;
+    using System.Collections.Generic;
+
+    using Sitecore.Data;
+    using Sitecore.Data.Items;
+
+    public static class TemplateHelper
+    {
+        public static List<Guid> GetBaseTemplates(Item item)
+        {
+            List<Guid> list = new List<Guid>();
+            GetBaseTemplates(item.Template, list);
+            return list;
+        }
+
+        private static void GetBaseTemplates(TemplateItem template, List<Guid> list)
+        {
+            list.Add(template.ID.Guid);
+            foreach (TemplateItem templateItem in template.BaseTemplates)
+            {
+                if (list.Contains(templateItem.ID.Guid))
+                {
+                    continue;
+                }
+                GetBaseTemplates(templateItem, list);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Sitecore.SharedSource.DynamicSitemap/packages.config b/Sitecore.SharedSource.DynamicSitemap/packages.config
new file mode 100644
index 0000000..dd92056
--- /dev/null
+++ b/Sitecore.SharedSource.DynamicSitemap/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<packages>
+  <package id="Sitecore.Kernel.NoReferences" version="8.2.160729" targetFramework="net452" developmentDependency="true" />
+</packages>
\ No newline at end of file
diff --git a/Sitecore.SharedSource.DynamicSitemap/sitecore modules/Shell/Dynamic Sitemap XML/DynamicSitemapManager.xml b/Sitecore.SharedSource.DynamicSitemap/sitecore modules/Shell/Dynamic Sitemap XML/DynamicSitemapManager.xml
index 7e9d5c8..65bec0b 100644
--- a/Sitecore.SharedSource.DynamicSitemap/sitecore modules/Shell/Dynamic Sitemap XML/DynamicSitemapManager.xml	
+++ b/Sitecore.SharedSource.DynamicSitemap/sitecore modules/Shell/Dynamic Sitemap XML/DynamicSitemapManager.xml	
@@ -1,13 +1,15 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
+
 <control xmlns:def="Definition" xmlns="http://schemas.sitecore.net/Visual-Studio-Intellisense">
   <DynamicSitemapManager>
     <FormPage Height="300px">
-      <CodeBeside Type="Sitecore.SharedSource.DynamicSitemap.DynamicSitemapManagerForm, Sitecore.SharedSource.DynamicSitemap"/>
+      <CodeBeside
+        Type="Sitecore.SharedSource.DynamicSitemap.DynamicSitemapManagerForm, Sitecore.SharedSource.DynamicSitemap" />
 
       <Panel ID="MainPanel" Height="100%">
         <Border Background="white" Height="100%" Style="padding: 0px 10px 10px 10px;">
           <Border Height="10px">
-            
+
           </Border>
           <Border>
             <Literal Style="font-size: 20px; font-weight: bold;" Text="Sitemap refreshing page" />
@@ -16,10 +18,11 @@
             <Literal Text="&lt;hr /&gt;" />
           </Border>
           <Border>
-            <Button ID="RefreshButton" Header="Refresh Sitemap" ToolTip="Refresh sitemap file and register it to robots.txt" Style="width: 125px;" />
+            <Button ID="RefreshButton" Header="Refresh Sitemap"
+                    ToolTip="Refresh sitemap file and register it to robots.txt" Style="width: 125px;" />
           </Border>
           <Border Height="10px">
-            
+
           </Border>
           <Border>
             <Literal ID="Message" />
@@ -27,13 +30,12 @@
           <Border Height="20px" />
 
           <Border ID="Content">
-            
-            
-            
+
+
           </Border>
-          
+
         </Border>
       </Panel>
     </FormPage>
   </DynamicSitemapManager>
-</control>
+</control>
\ No newline at end of file
diff --git a/Unicorn-Serialization/Dynamic Sitemap XML/Templates/Dynamic Sitemap XML/Site Configuration/Configuration/Included Base Templates.yml b/Unicorn-Serialization/Dynamic Sitemap XML/Templates/Dynamic Sitemap XML/Site Configuration/Configuration/Included Base Templates.yml
new file mode 100644
index 0000000..67a4268
--- /dev/null
+++ b/Unicorn-Serialization/Dynamic Sitemap XML/Templates/Dynamic Sitemap XML/Site Configuration/Configuration/Included Base Templates.yml	
@@ -0,0 +1,32 @@
+---
+ID: "b6c2e413-bb87-45f7-b993-c17e27c9c89f"
+Parent: "904362c4-7a63-4765-88dd-98134ea185f6"
+Template: "455a3e98-a627-4b40-8035-e683a0331ac7"
+Path: /sitecore/templates/Dynamic Sitemap XML/Site Configuration/Configuration/Included Base Templates
+DB: master
+SharedFields:
+- ID: "1eb8ae32-e190-44a6-968d-ed904c794ebf"
+  Hint: Source
+  Value: /sitecore/templates
+- ID: "24cb32f0-e364-4f37-b400-0f2899097b5b"
+  Hint: Enable Shared Language Fallback
+  Type: Checkbox
+  Value: 1
+- ID: "ab162cc0-dc80-4abf-8871-998ee5d7ba32"
+  Hint: Type
+  Value: Treelist
+- ID: "ba3f86a2-4a1c-4d78-b63d-91c2779c1b5e"
+  Hint: __Sortorder
+  Value: 100
+Languages:
+- Language: en
+  Fields:
+  - ID: "19a69332-a23e-4e70-8d16-b2640cb24cc8"
+    Hint: Title
+    Value: 
+  Versions:
+  - Version: 1
+    Fields:
+    - ID: "25bed78c-4957-4165-998a-ca1b52f67497"
+      Hint: __Created
+      Value: 20160126T132709Z