diff --git a/code/GoogleSitemapDecorator.php b/code/GoogleSitemapDecorator.php
index 4e85382..80b64b1 100644
--- a/code/GoogleSitemapDecorator.php
+++ b/code/GoogleSitemapDecorator.php
@@ -6,14 +6,14 @@
  * 
  * @package googlesitemaps
  */
-class GoogleSitemapDecorator extends DataObjectDecorator {
+class GoogleSitemapDecorator extends DataExtension {
     
 }
 
 /**
  * @package googlesitemaps
  */
-class GoogleSitemapSiteTreeDecorator extends SiteTreeDecorator {
+class GoogleSitemapSiteTreeDecorator extends DataExtension {
 
 	function extraStatics() {
 		return array(
@@ -23,7 +23,7 @@ class GoogleSitemapSiteTreeDecorator extends SiteTreeDecorator {
 		);
 	}
 
-	function updateCMSFields(&$fields) {
+	function updateSettingsFields(&$fields) {
 		$prorities = array(
 			'' => _t('SiteTree.PRIORITYAUTOSET', 'Auto-set based on page depth'),
 			'-1' => _t('SiteTree.PRIORITYNOTINDEXED', "Not indexed"), // We set this to -ve one because a blank value implies auto-generation of Priority
@@ -39,7 +39,7 @@ class GoogleSitemapSiteTreeDecorator extends SiteTreeDecorator {
 			'0.1' => '10 - ' . _t('SiteTree.PRIORITYLEASTIMPORTANT', "Least important")
 		);
 
-		$tabset = $fields->findOrMakeTab('Root.Content');
+		$tabset = $fields->findOrMakeTab('Root.Settings');
 		
 		$message = "<p>";
 		$message .= sprintf(_t('SiteTree.METANOTEPRIORITY', "Manually specify a Google Sitemaps priority for this page (%s)"), 
diff --git a/templates/GoogleSitemap.ss b/templates/GoogleSitemap.ss
index 9272ed4..b681336 100644
--- a/templates/GoogleSitemap.ss
+++ b/templates/GoogleSitemap.ss
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-	<% control Items %>
-	<url>
-		<loc>$AbsoluteLink</loc>
-		<lastmod>$LastEdited.Format(c)</lastmod>
-		<% if ChangeFreq %><changefreq>$ChangeFreq</changefreq><% end_if %>
-		<% if Priority %><priority>$Priority</priority><% end_if %>
-	</url>
-	<% end_control %>
+	<% loop $Items %>
+        <url>
+            <loc>$AbsoluteLink</loc>
+            <lastmod>$LastEdited.Format(c)</lastmod>
+            <% if $ChangeFreq %><changefreq>$ChangeFreq</changefreq><% end_if %>
+            <% if $Priority %><priority>$Priority</priority><% end_if %>
+        </url>
+	<% end_loop %>
 </urlset>
\ No newline at end of file