diff --git a/bds/source/java/ch/systemsx/cisd/bds/storage/filesystem/LinkMakerProvider.java b/bds/source/java/ch/systemsx/cisd/bds/storage/filesystem/LinkMakerProvider.java
index 0d15b8ac09932838745826d48c52ac4656c62dc3..4ce7a2b7bbb79903d7716eb06222f6c89fe48336 100644
--- a/bds/source/java/ch/systemsx/cisd/bds/storage/filesystem/LinkMakerProvider.java
+++ b/bds/source/java/ch/systemsx/cisd/bds/storage/filesystem/LinkMakerProvider.java
@@ -16,6 +16,7 @@
 
 package ch.systemsx.cisd.bds.storage.filesystem;
 
+import ch.systemsx.cisd.common.Constants;
 import ch.systemsx.cisd.common.exceptions.EnvironmentFailureException;
 import ch.systemsx.cisd.common.utilities.IPathImmutableCopier;
 import ch.systemsx.cisd.common.utilities.RecursiveHardLinkMaker;
@@ -30,10 +31,6 @@ public final class LinkMakerProvider
 
     private static final String NO_HARD_LINK_EXECUTABLE = "No hard link executable has been found.";
 
-    private static final long MILLIS_TO_WAIT_FOR_COMPLETION = 10000L;
-
-    private static final long MILLIS_TO_SLEEP_AFTER_COPY_FAILS = 3000L;
-
     private static final int MAX_COPY_RETRIES = 7;
 
     private static IPathImmutableCopier hardLinkMaker;
@@ -46,8 +43,8 @@ public final class LinkMakerProvider
     private final static IPathImmutableCopier tryCreateHardLinkMaker()
     {
         final IPathImmutableCopier copier =
-                RecursiveHardLinkMaker.tryCreateRetrying(MILLIS_TO_WAIT_FOR_COMPLETION,
-                        MAX_COPY_RETRIES, MILLIS_TO_SLEEP_AFTER_COPY_FAILS);
+                RecursiveHardLinkMaker.tryCreateRetrying(Constants.MILLIS_TO_WAIT_BEFORE_TIMEOUT,
+                        MAX_COPY_RETRIES, Constants.MILLIS_TO_SLEEP_BEFORE_RETRYING);
         if (copier != null)
         {
             return copier;