diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServer.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServer.java
index 28d31529a9eb21adf4c34c9a69f1b45d3c2347fd..4b55434070b16e9c873dc00b10a620cc53883c95 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServer.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServer.java
@@ -204,7 +204,9 @@ public class DataStoreServer
     /**
      * Initialize RPC service interfaces
      */
-    // This could be changed to use the config parameters in the future.
+    // TODO: The registration process here needs to be made cleaner -- perhaps by using Spring and
+    // the dssApplicationContext.xml more effectively, or perhaps by using annotations and
+    // reflection.
     private static void initializeRpcServices(final Context context,
             final ApplicationContext applicationContext, final ConfigParameters configParameters)
     {