diff --git a/organize/configure.zcml b/organize/configure.zcml
index e54ca82..2ee6835 100644
--- a/organize/configure.zcml
+++ b/organize/configure.zcml
@@ -26,9 +26,9 @@
   <zope:adapter factory="loops.organize.party.Address" trusted="True" />
   <zope:class class="loops.organize.party.Address">
     <require permission="zope.View"
-             interface="cybertools.organize.interfaces.IAddress" />
+             interface="loops.organize.interfaces.IAddress" />
     <require permission="zope.ManageContent"
-             set_schema="cybertools.organize.interfaces.IAddress" />
+             set_schema="loops.organize.interfaces.IAddress" />
   </zope:class>
 
   <zope:adapter factory="loops.organize.task.Task" trusted="True" />
diff --git a/organize/interfaces.py b/organize/interfaces.py
index 204d798..04600c6 100644
--- a/organize/interfaces.py
+++ b/organize/interfaces.py
@@ -29,6 +29,7 @@ from zope.app.principalannotation import annotations
 from zope.app.security.interfaces import IAuthentication, PrincipalLookupError
 from zope.security.proxy import removeSecurityProxy
 
+from cybertools.organize.interfaces import IAddress as IBaseAddress
 from cybertools.organize.interfaces import IPerson as IBasePerson
 from cybertools.organize.interfaces import ITask
 from loops.interfaces import IConceptSchema
@@ -99,6 +100,11 @@ class IPerson(IConceptSchema, IBasePerson):
                     required=False,)
 
 
+class IAddress(IConceptSchema, IBaseAddress):
+    """ See cybertools.organize.
+    """
+
+
 class IPasswordEntry(Interface):
 
     password = schema.Password(title=_(u'Password'),
diff --git a/organize/party.py b/organize/party.py
index 42edf6b..78cb2e1 100644
--- a/organize/party.py
+++ b/organize/party.py
@@ -34,13 +34,13 @@ from zope.schema.interfaces import ValidationError
 from zope.app.form.interfaces import WidgetInputError
 from zope.security.proxy import removeSecurityProxy
 
-from cybertools.organize.interfaces import IAddress
 from cybertools.organize.party import Person as BasePerson
 from cybertools.relation.interfaces import IRelationRegistry
 from cybertools.typology.interfaces import IType
 from loops.common import AdapterBase
 from loops.concept import Concept
 from loops.interfaces import IConcept
+from loops.organize.interfaces import IAddress
 from loops.organize.interfaces import IPerson, ANNOTATION_KEY
 from loops.security.common import assignOwner, removeOwner, allowEditingForOwner
 from loops.type import TypeInterfaceSourceList
diff --git a/organize/tracking/configure.zcml b/organize/tracking/configure.zcml
index 2b0cee7..40b8cdc 100644
--- a/organize/tracking/configure.zcml
+++ b/organize/tracking/configure.zcml
@@ -11,10 +11,10 @@
              set_schema="cybertools.tracking.interfaces.ITrack" />
   </class>
 
-  <class class="loops.organize.tracking.change.ChangeRecord">
+  <!--<class class="loops.organize.tracking.change.ChangeRecord">
     <require permission="zope.View"
              interface="cybertools.tracking.interfaces.ITrackingStorage" />
-  </class>
+  </class>-->
 
   <subscriber handler="loops.organize.tracking.change.recordModification" />
   <subscriber handler="loops.organize.tracking.change.recordAssignment" />