diff --git a/ChangeLog b/ChangeLog
index 90cbb4f..44c7ee4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-27  David Ayers  <d.ayers@inode.at>
+
+	* EOControl/EOEditingContext.h/m
+	(setDefaultFetchTimestampLag:, defaultFetchTimestampLag):
+	Implemented.
+	
 2005-01-26  David Ayers  <d.ayers@inode.at>
 
 	* EOAccess/EOUtilities.m (NSObjectNotAvailableException): 
diff --git a/EOControl/EOEditingContext.h b/EOControl/EOEditingContext.h
index b728fb4..6544d35 100644
--- a/EOControl/EOEditingContext.h
+++ b/EOControl/EOEditingContext.h
@@ -99,6 +99,9 @@
   NSAutoreleasePool * _lockPool;
 }
 
++ (void)setDefaultFetchTimestampLag: (NSTimeInterval)lag;
++ (NSTimeInterval)defaultFetchTimestampLag;
+
 + (void)setInstancesRetainRegisteredObjects: (BOOL)flag;
 + (BOOL)instancesRetainRegisteredObjects;
 
diff --git a/EOControl/EOEditingContext.m b/EOControl/EOEditingContext.m
index f0a6ae8..a6d1c5f 100644
--- a/EOControl/EOEditingContext.m
+++ b/EOControl/EOEditingContext.m
@@ -76,6 +76,7 @@ RCS_ID("$Id$")
 
 
 static EOObjectStore *defaultParentStore = nil;
+static NSTimeInterval defaultFetchLag = 3600.0;
 
 //Notifications
 NSString *EOObjectsChangedInEditingContextNotification = @"EOObjectsChangedInEditingContextNotification";
@@ -90,6 +91,16 @@ NSString *EOEditingContextDidSaveChangesNotification = @"EOEditingContextDidSave
     }
 }
 
++ (NSTimeInterval)defaultFetchTimestampLag
+{
+  return defaultFetchLag;
+}
+
++ (void)setDefaultFetchTimestampLag: (NSTimeInterval)lag
+{
+  defaultFetchLag = lag;
+}
+
 + (void)setInstancesRetainRegisteredObjects: (BOOL)flag
 {
   [self notImplemented: _cmd];
diff --git a/EOControl/EONSAddOns.m b/EOControl/EONSAddOns.m
index 86c46c9..f7137e0 100644
--- a/EOControl/EONSAddOns.m
+++ b/EOControl/EONSAddOns.m
@@ -190,7 +190,7 @@ GDL2_ActivateAllGDL2Categories(void)
                         object,
                         sel_get_name(sel));
 
-              [results addObject: result]; //TODO What to do if nil ??
+              [results addObject: result];
             }
         }
       NS_HANDLER