diff --git a/EOControl/EOClassDescription.m b/EOControl/EOClassDescription.m
index 5908907..9db8ade 100644
--- a/EOControl/EOClassDescription.m
+++ b/EOControl/EOClassDescription.m
@@ -743,11 +743,6 @@ fromInsertionInEditingContext: (EOEditingContext *)editingContext
 @end
 @implementation GDL2CDNSObject
 
-+ (void)load
-{
-  GDL2_Activate([self class], YES);
-}
-
 // when you enable the NSDebugMLLogs here you will have a loop. dave
 - (EOClassDescription *)classDescription
 {
diff --git a/EOControl/EOKeyValueCoding.m b/EOControl/EOKeyValueCoding.m
index ac499f0..b01be97 100644
--- a/EOControl/EOKeyValueCoding.m
+++ b/EOControl/EOKeyValueCoding.m
@@ -96,12 +96,6 @@ initialize(void)
 @end
 @implementation GDL2KVCNSObject
 
-+ (void)load
-{
-  GDL2_Activate([self class], YES);
-}
-
-
 /* This is what -base(add) will call.  It should invoke what the API
    specifies should be overridden.  */
 - (void) setNilValueForKey: (NSString*)aKey
@@ -236,11 +230,6 @@ initialize(void)
 @end
 @implementation	GDL2KVCNSArray
 
-+ (void)load
-{
-  GDL2_Activate([self class], YES);
-}
-
 /**
  * EOKeyValueCoding protocol<br/>
  * This overrides NSObjects implementation of this method.
@@ -541,12 +530,6 @@ initialize(void)
 @end
 @implementation	GDL2KVCNSDictionary
 
-
-+ (void)load
-{
-  GDL2_Activate([self class], YES);
-}
-
 /**
  * Returns the object stored in the dictionary for this key.
  * Unlike Foundation, this method may return objects for keys other than
@@ -847,11 +830,6 @@ initialize(void)
 @end
 @implementation GDL2KVCNSMutableDictionary
 
-+ (void)load
-{
-  GDL2_Activate([self class], YES);
-}
-
 /**
  * Method to augment the NSKeyValueCoding implementation
  * to account for added functionality such as quoted key paths.
diff --git a/EOControl/EONSAddOns.m b/EOControl/EONSAddOns.m
index 06dc9e5..0813f22 100644
--- a/EOControl/EONSAddOns.m
+++ b/EOControl/EONSAddOns.m
@@ -133,7 +133,7 @@ GDL2_Activate(Class cls, BOOL isInstance)
 }
 
 void
-GDL2_ActivateAllGDL2Categories(void)
+GDL2_ActivateAll(void)
 {
   /* EOKeyValueCoding */
   GDL2_Activate([GDL2KVCNSObject class], YES);
@@ -146,6 +146,12 @@ GDL2_ActivateAllGDL2Categories(void)
 
 }
 
+@implementation NSObject (GDL2_Activate)
++(void)load
+{
+  GDL2_ActivateAll();
+}
+@end
 
 @implementation NSObject (NSObjectPerformingSelector)