diff --git a/src/main/java/org/openmuc/openiec61850/DataSet.java b/src/main/java/org/openmuc/openiec61850/DataSet.java
index d1e8c61..adadba0 100644
--- a/src/main/java/org/openmuc/openiec61850/DataSet.java
+++ b/src/main/java/org/openmuc/openiec61850/DataSet.java
@@ -142,7 +142,13 @@ public final class DataSet implements Iterable<FcModelNode> {
 
     @Override
     public String toString() {
-        return dataSetReference;
+        StringBuilder sb = new StringBuilder();
+        sb.append(getReferenceStr());
+        for (FcModelNode member : members) {
+            sb.append("\n");
+            sb.append(member.toString());
+        }
+        return sb.toString();
     }
 
 }
diff --git a/src/main/java/org/openmuc/openiec61850/ServerModel.java b/src/main/java/org/openmuc/openiec61850/ServerModel.java
index e394988..d5fc419 100644
--- a/src/main/java/org/openmuc/openiec61850/ServerModel.java
+++ b/src/main/java/org/openmuc/openiec61850/ServerModel.java
@@ -215,15 +215,21 @@ public final class ServerModel extends ModelNode {
         for (ModelNode logicalDevice : children.values()) {
             sb.append(logicalDevice.toString());
         }
-        sb.append("\nURCBs:");
+        sb.append("\n\n\n---------------------\nURCBs:");
         for (Urcb urcb : getUrcbs()) {
             sb.append("\n\n").append(urcb);
         }
 
-        sb.append("\n\nBRCBs:");
+        sb.append("\n\n\n---------------------\nBRCBs:");
         for (Brcb brcb : getBrcbs()) {
             sb.append("\n\n").append(brcb);
         }
+
+        sb.append("\n\n\n---------------------\nData sets:");
+        for (DataSet dataSet : getDataSets()) {
+            sb.append("\n\n").append(dataSet);
+        }
+
         return sb.toString();
     }