diff --git a/src/main/java/it/unibz/inf/isoga/util/DSetConfig.java b/src/main/java/it/unibz/inf/isoga/util/DSetConfig.java
index ad555c265b60398848c96d8f53ed25ac65d1ea82..974edb296e9c92fa2c4ea6406972db0626a71c7c 100644
--- a/src/main/java/it/unibz/inf/isoga/util/DSetConfig.java
+++ b/src/main/java/it/unibz/inf/isoga/util/DSetConfig.java
@@ -8,7 +8,9 @@ import it.unibz.inf.isoga.geometry.BBox;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Collection;
 import java.util.Date;
 
 import org.json.JSONArray;
@@ -165,8 +167,17 @@ public final class DSetConfig implements Cloneable {
 		return serverSRID;
 	}
 
-	public TableEntry[] getTableEntries() {
-		return new TableEntry[] {edgeTableEntry, vertexTableEntry, vertexAnnotatedTableEntry, areaBufferTableEntry};
+	public Collection<TableEntry> getTableEntries() {
+		// CHECKSTYLE:OFF MagicNumber
+		final Collection<TableEntry> result = new ArrayList<TableEntry>(4);
+		// CHECKSTYLE:ON MagicNumber
+
+		result.add(edgeTableEntry);
+		result.add(vertexTableEntry);
+		result.add(vertexAnnotatedTableEntry);
+		result.add(areaBufferTableEntry);
+
+		return result;
 	}
 
 	public TableEntry getVertexAnnotatedTableEntry() {