diff --git a/code/GoogleAnalyzer.php b/code/GoogleAnalyzer.php
index 3c6dd6d..e4dd18c 100644
--- a/code/GoogleAnalyzer.php
+++ b/code/GoogleAnalyzer.php
@@ -1,6 +1,9 @@
 <?php
 
-class GoogleAnalyzer extends DataObjectDecorator {
+/**
+ * @package googleanalytics
+ */
+class GoogleAnalyzer extends DataExtension {
 
 	static public $sapphire_version;
 
@@ -9,13 +12,9 @@ class GoogleAnalyzer extends DataObjectDecorator {
 	public static $email;
 	public static $password;
 
-	function extraStatics() {
-		return array(
-			'has_many' => array(
-				'Events' => 'GoogleLogEvent',
-			),
-		);
-	}
+	public $has_many = array(
+		'Events' => 'GoogleLogEvent',
+	);
 
 	/**
 	 *	for legacy reasons
@@ -48,10 +47,8 @@ public static function activate($profile = 'SiteConfig', $email = null, $passwor
 		Object::add_extension('SiteTree', 'GoogleAnalyzer');
 	}
 
-	public function updateCMSFields(FieldSet $fields) {
-
+	public function updateCMSFields(FieldList $fields) {
 		$fields->addFieldToTab('Root', new Tab('GoogleAnalytics', 'Google Analytics'));
-		
 		$fields->addFieldToTab("Root.GoogleAnalytics", new TabSet('Stats'));
 		$fields->addFieldToTab('Root.GoogleAnalytics.Stats', new Tab('Performance', 'Performance'));
 		$fields->addFieldToTab("Root.GoogleAnalytics.Stats.Performance", new GooglePerformanceChart($this->owner));
diff --git a/code/GoogleConfig.php b/code/GoogleConfig.php
index cb12e7d..f3d39f6 100644
--- a/code/GoogleConfig.php
+++ b/code/GoogleConfig.php
@@ -1,19 +1,18 @@
 <?php
 
-class GoogleConfig extends DataObjectDecorator {
+/**
+ * @package googleanalytics
+ */
+class GoogleConfig extends DataExtension {
 
-	function extraStatics() {
-		return array(
-			'db' => array(
-				'GoogleAnalyticsCode' => 'Varchar',
-				'GoogleAnalyticsProfileId' => 'Varchar',
-				'GoogleAnalyticsEmail' => 'Varchar',
-				'GoogleAnalyticsPassword' => 'Varchar',
-			),
-		);
-	}
+	public $db = array(
+		'GoogleAnalyticsCode' => 'Varchar',
+		'GoogleAnalyticsProfileId' => 'Varchar',
+		'GoogleAnalyticsEmail' => 'Varchar',
+		'GoogleAnalyticsPassword' => 'Varchar',
+	);
 
-	public function updateCMSFields(FieldSet $fields) {
+	public function updateCMSFields(FieldList $fields) {
 
 		$fields->addFieldToTab("Root", new Tab('GoogleAnalytics'));
 		$fields->addFieldToTab('Root.GoogleAnalytics', new TextField('GoogleAnalyticsCode', 'Google Analytics Code (UA-XXXXXX-X)'));
diff --git a/code/GoogleLogger.php b/code/GoogleLogger.php
index fe8efde..eb8cbdf 100644
--- a/code/GoogleLogger.php
+++ b/code/GoogleLogger.php
@@ -74,14 +74,14 @@ public function onAfterInit() {
 	/**
 	 * @param bool
 	 */
-	public function set_event_tracking_enabled($bool) {
+	public static function set_event_tracking_enabled($bool) {
 		self::$include_event_tracking = (bool) $bool;
 	}
 	
 	/**
 	 * @return bool
 	 */
-	public function event_tracking_enabled() {
+	public static function event_tracking_enabled() {
 		return self::$include_event_tracking;
 	}
 }
\ No newline at end of file