diff --git a/waltz-jobs/src/main/java/org/finos/waltz/jobs/example/DemoDataLoader.java b/waltz-jobs/src/main/java/org/finos/waltz/jobs/example/DemoDataLoader.java
index 4c172e8ba5..20f5758026 100644
--- a/waltz-jobs/src/main/java/org/finos/waltz/jobs/example/DemoDataLoader.java
+++ b/waltz-jobs/src/main/java/org/finos/waltz/jobs/example/DemoDataLoader.java
@@ -112,10 +112,7 @@ private void go() throws IOException {
             processDataTypes(waltz, workbook.getSheet("data-types"), now);
             processDataFlows(waltz, workbook.getSheet("flows"), now);
 
-            LOG.debug("Rebuilding categories");
-            hierarchyService.buildFor(EntityKind.ORG_UNIT);
-            hierarchyService.buildFor(EntityKind.MEASURABLE);
-            hierarchyService.buildFor(EntityKind.PERSON);
+            rebuildHierarchies();
 
 
             throw new RuntimeException("rolling back, comment this line if you really want to do this!");
@@ -125,6 +122,15 @@ private void go() throws IOException {
     }
 
 
+    private void rebuildHierarchies() {
+        LOG.debug("Rebuilding hierarchies");
+        hierarchyService.buildFor(EntityKind.ORG_UNIT);
+        hierarchyService.buildFor(EntityKind.MEASURABLE);
+        hierarchyService.buildFor(EntityKind.PERSON);
+        hierarchyService.buildFor(EntityKind.DATA_TYPE);
+    }
+
+
     private void processDataFlows(DSLContext waltz,
                                   Sheet flowSheet,
                                   Timestamp now) {