diff --git a/metafix/src/main/java/org/metafacture/metafix/Metafix.java b/metafix/src/main/java/org/metafacture/metafix/Metafix.java
index dcff754c..aeb1dbb5 100644
--- a/metafix/src/main/java/org/metafacture/metafix/Metafix.java
+++ b/metafix/src/main/java/org/metafacture/metafix/Metafix.java
@@ -189,7 +189,9 @@ public void startEntity(final String name) {
             throw new IllegalArgumentException("Entity name must not be null.");
         }
 
-        final Value value = Value.newHash();
+        final Value value = name.endsWith(ARRAY_MARKER) ? Value.newArray() : Value.newHash();
+        // TODO: Remove array marker? => name.substring(0, name.length() - ARRAY_MARKER.length());
+
         addValue(name, value);
         entities.add(value);