diff --git a/circle/storage/models.py b/circle/storage/models.py
index 50cd10a..bdc4ffb 100644
--- a/circle/storage/models.py
+++ b/circle/storage/models.py
@@ -18,7 +18,8 @@ class DataStore(models.Model):
                             verbose_name=_('name'))
     path = models.CharField(max_length=200, unique=True,
                             verbose_name=_('path'))
-
+    hostname = models.CharField(max_length=40, unique=True,
+                                verbose_name=_('hostname'))
     class Meta:
         ordering = ['name']
         verbose_name = _('datastore')
diff --git a/circle/storage/tasks.py b/circle/storage/tasks.py
index ce473e0..8ef10c5 100644
--- a/circle/storage/tasks.py
+++ b/circle/storage/tasks.py
@@ -1,26 +1,24 @@
 import celery
-from celery.contrib.methods import task_method
-
 import logging
 
 logger = logging.getLogger(__name__)
 
 
-class StorageDriver:
-    @celery.task(filter=task_method, name='storagedriver.list_disks')
-    def list_disks(dir):
-        pass
+@celery.task(name='storagedriver.list_disks')
+def list_disks(dir):
+    pass
+
+
+@celery.task(name='storagedriver.create_disk')
+def create_disk(disk_desc):
+    pass
+
 
-    @celery.task(filter=task_method, name='storagedriver.create_disk')
-    def create_disk(disk_desc):
-        pass
+@celery.task(name='storagedriver.delete_disk')
+def delete_disk(json_data):
+    pass
 
-    @celery.task(filter=task_method, name='storagedriver.delete_disk')
-    def delete_disk(json_data):
-        # TODO review
-        pass
 
-    @celery.task(filter=task_method, name='storagedriver.get_disk')
-    def get_disk(json_data):
-        # TODO review
-        pass
+@celery.task(name='storagedriver.get_disk')
+def get_disk(json_data):
+    pass