diff --git a/ereuse_devicehub/__init__.py b/ereuse_devicehub/__init__.py
index 4755c9a1..1ca01080 100644
--- a/ereuse_devicehub/__init__.py
+++ b/ereuse_devicehub/__init__.py
@@ -1,4 +1,4 @@
 from distutils.version import StrictVersion
 
-__version__ = '0.2.0a12'
+__version__ = '0.2.0a13'
 version = StrictVersion(__version__)
diff --git a/ereuse_devicehub/resources/agent/models.pyi b/ereuse_devicehub/resources/agent/models.pyi
index 0207a8cf..e4b5853e 100644
--- a/ereuse_devicehub/resources/agent/models.pyi
+++ b/ereuse_devicehub/resources/agent/models.pyi
@@ -7,6 +7,7 @@ from sqlalchemy_utils import PhoneNumber
 
 from ereuse_devicehub.resources.event.models import Event, Trade
 from ereuse_devicehub.resources.models import Thing
+from ereuse_devicehub.resources.tag.model import Tag
 from ereuse_devicehub.resources.user import User
 from teal import enums
 
@@ -39,6 +40,7 @@ class Organization(Agent):
     def __init__(self, name: str, **kwargs):
         super().__init__(**kwargs)
         self.members = ...  # type: Set[Membership]
+        self.tags = ... # type: Set[Tag]
 
     @classmethod
     def get_default_org_id(cls) -> uuid.UUID:
diff --git a/setup.py b/setup.py
index 3f87cace..20d73c18 100644
--- a/setup.py
+++ b/setup.py
@@ -35,19 +35,19 @@ setup(
     long_description=long_description,
     long_description_content_type='text/markdown',
     install_requires=[
-        'teal>=0.2.0a11',
-        'marshmallow_enum',
-        'ereuse-utils[Naming]>=0.4b1',
-        'psycopg2-binary',
-        'requests',
-        'requests-toolbelt',
-        'hashids',
         'click',
         'click-spinner',
-        'sqlalchemy-utils[password, color, phone]',
-        'PyYAML',
+        'ereuse-rate==0.0.2',
+        'ereuse-utils[Naming]>=0.4b1',
+        'hashids',
+        'marshmallow_enum',
+        'psycopg2-binary',
         'python-stdnum',
-        'ereuse-rate==0.0.2'
+        'PyYAML',
+        'teal>=0.2.0a12',
+        'requests',
+        'requests-toolbelt',
+        'sqlalchemy-utils[password, color, phone]',
     ],
     extras_require={
         'docs': [