diff --git a/google_analytics/admin.py b/google_analytics/admin.py
index 2f0571f..18f0661 100644
--- a/google_analytics/admin.py
+++ b/google_analytics/admin.py
@@ -1,4 +1,12 @@
-from google_analytics.models import Analytics
+from .models import Analytics
 from django.contrib import admin
+from django.contrib.sites.admin import SiteAdmin, Site
 
-admin.site.register(Analytics)
+class AnalyticsInlineAdmin(admin.StackedInline):
+    model = Analytics
+
+class AnalyticsSiteAdmin(SiteAdmin):
+    inlines = [AnalyticsInlineAdmin]
+
+admin.site.unregister(Site)
+admin.site.register(Site, AnalyticsSiteAdmin)
\ No newline at end of file
diff --git a/google_analytics/models.py b/google_analytics/models.py
index 58e0eed..7ac462f 100644
--- a/google_analytics/models.py
+++ b/google_analytics/models.py
@@ -3,8 +3,12 @@
 from django.contrib.sites.models import Site
 
 class Analytics(models.Model):
-    site = models.ForeignKey(Site)
+    site = models.OneToOneField(Site)
     analytics_code = models.CharField(blank=True, max_length=100)
+    analytics_domain = models.CharField(blank=True, max_length=100,
+        help_text="You can set here the analytics domain to merge reports with other sites")
+    track_page_load = models.BooleanField("Track page load time",
+        blank=True, default=False)
 
     def __unicode__(self):
         return u"%s" % (self.analytics_code)
diff --git a/google_analytics/templates/google_analytics/analytics_async_template.html b/google_analytics/templates/google_analytics/analytics_async_template.html
index e706e5b..8b4b71e 100644
--- a/google_analytics/templates/google_analytics/analytics_async_template.html
+++ b/google_analytics/templates/google_analytics/analytics_async_template.html
@@ -1,6 +1,7 @@
 <script type="text/javascript">
     var _gaq = _gaq || [];
     _gaq.push(['_setAccount', '{{ analytics_code }}']);
+    {% if analytics_domain %}_gaq.push(['_setDomainName', '{{ analytics_domain }}']);{% endif %}
     _gaq.push(['_trackPageview']);
 
     {% if track_page_load_time %}
diff --git a/google_analytics/templatetags/analytics.py b/google_analytics/templatetags/analytics.py
index 1e34196..a795917 100644
--- a/google_analytics/templatetags/analytics.py
+++ b/google_analytics/templatetags/analytics.py
@@ -1,13 +1,12 @@
 from django import template
 from django.conf import settings
-from django.db import models
+from ..models import Analytics
 from django.contrib.sites.models import Site
 
 from django.template import Context, loader
 
 
 register = template.Library()
-Analytics = models.get_model('googleanalytics', 'analytics')
 
 def do_get_analytics(parser, token):
     contents = token.split_contents()
@@ -40,23 +39,26 @@ def __init__(self, site=None, code=None, template_name='google_analytics/analyti
     def render(self, context):
         content = ''
         if self.site:
-            code_set = self.site.analytics_set.all()
-            if code_set:
-                code = code_set[0].analytics_code
-            else:
+            try:
+                code = self.site.analytics
+            except Analytics.DoesNotExist:
                 return ''
+
         elif self.code:
-            code = self.code
+            code = type('Code', (object,), {
+                'analytics_code': self.code,
+                'analytics_domain': '',
+                'track_page_load': False
+            })()
         else:
             return ''
         
-        if code.strip() != '':
+        if code.analytics_code.strip() != '':
             t = loader.get_template(self.template_name)
             c = Context({
-                'analytics_code': code,
-                'track_page_load_time': getattr(settings,
-                                                "GOOGLE_ANALYTICS_TRACK_PAGE_LOAD_TIME",
-                                                False),
+                'analytics_code': code.analytics_code,
+                'analytics_domain': code.analytics_domain,
+                'track_page_load_time': code.track_page_load,
             })
             return t.render(c)
         else:
diff --git a/setup.py b/setup.py
index e3706cd..be54070 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-from distutils.core import setup
+from setuptools import setup
 
 setup(name='google_analytics',
       version='0.2',