diff --git a/bin/swh-loader-dir b/bin/swh-loader-dir
index 9d10b7d..b9bb9a1 100755
--- a/bin/swh-loader-dir
+++ b/bin/swh-loader-dir
@@ -1,30 +1,55 @@
 #!/usr/bin/env python3
 
+# NOT FOR PRODUCTION
+
 # Copyright (C) 2015  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 import logging
 import sys
 
 
 from swh.loader.dir.loader import DirLoader
 
 
 dir_loader_config = DirLoader.parse_config_file(config_filename=sys.argv[1])
 
 
 logging.basicConfig(
     level=logging.DEBUG,
     format='%(asctime)s %(name)s %(levelname)s %(message)s',
     handlers=[
         logging.StreamHandler()
     ],
 )
 
 requests_log = logging.getLogger("requests")
 requests_log.setLevel(logging.CRITICAL)
 
+
+def load_keys_from_properties(config, key_pattern):
+    m = {
+        key[len(key_pattern):]: value
+        for key, value in dir_loader_config.items()
+        if key.startswith(key_pattern)
+    }
+    return m
+
+
+dir_path = dir_loader_config['dir_path']
+
+origin = load_keys_from_properties(dir_loader_config, 'origin_')
+
+release = load_keys_from_properties(dir_loader_config, 'release_')
+release['date'] = int(release['date'])
+
+revision = load_keys_from_properties(dir_loader_config, 'revision_')
+revision['committer_date'] = int(revision['committer_date'])
+revision['author_date'] = int(revision['author_date'])
+
+occurrence = load_keys_from_properties(dir_loader_config, 'occurrence_')
+
 loader = DirLoader(dir_loader_config)
-loader.process(dir_loader_config)
+loader.process(dir_path, origin, revision, release, occurrence)
diff --git a/resources/test/loader-dir.ini b/resources/test/loader-dir.ini
index c6a09d5..bdf4af8 100644
--- a/resources/test/loader-dir.ini
+++ b/resources/test/loader-dir.ini
@@ -1,30 +1,32 @@
 [main]
 
 dir_path = /home/tony/work/inria/repo/linux-tryouts
-# dir_path = /home/tony/tmp2
 
 # synthetic origin
 origin_url = file:///dev/null
-branch = master
-authority_id = 1
-validity = 2015-01-01 00:00:00+00
+origin_type = dir
+
+# occurrence
+occurrence_branch = master
+occurrence_authority = 1
+occurrence_validity = 2015-01-01 00:00:00+00
 
 # synthetic revision
 revision_author_name = swh author
 revision_author_email = swh@inria.fr
 revision_author_date = 1444054085
 revision_author_offset = +0200
 revision_committer_name = swh committer
 revision_committer_email = swh@inria.fr
 revision_committer_date = 1444054085
 revision_committer_offset = +0200
 revision_type = tar
 revision_message = synthetic revision message
 
 # synthetic release
 release_name = v0.0.1
 release_date = 1444054085
 release_offset = +0200
 release_author_name = swh author
 release_author_email = swh@inria.fr
 release_comment = synthetic release