diff --git a/src/Dax.Metadata/CalculationItem.cs b/src/Dax.Metadata/CalculationItem.cs
index 03fd6ea..47e5944 100644
--- a/src/Dax.Metadata/CalculationItem.cs
+++ b/src/Dax.Metadata/CalculationItem.cs
@@ -1,9 +1,8 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.Serialization;
+using System.Diagnostics;
 
 namespace Dax.Metadata
 {
+    [DebuggerDisplay("{ItemName.Name,nq}")]
     public class CalculationItem
     {
         public CalculationItem(CalculationGroup calculationGroup) : this()
diff --git a/src/Dax.Metadata/Column.cs b/src/Dax.Metadata/Column.cs
index 7285d78..f8f4958 100644
--- a/src/Dax.Metadata/Column.cs
+++ b/src/Dax.Metadata/Column.cs
@@ -2,9 +2,11 @@
 using System.Linq;
 using Newtonsoft.Json;
 using System.Runtime.Serialization;
+using System.Diagnostics;
 
 namespace Dax.Metadata
 {
+    [DebuggerDisplay("{Table.TableName.Name,nq}[{ColumnName.Name,nq}]")]
     public class Column
     {
         public Column(Table table) : this()
diff --git a/src/Dax.Metadata/Measure.cs b/src/Dax.Metadata/Measure.cs
index 8650a21..c5874a1 100644
--- a/src/Dax.Metadata/Measure.cs
+++ b/src/Dax.Metadata/Measure.cs
@@ -1,11 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Diagnostics;
 
 namespace Dax.Metadata
 {
+    [DebuggerDisplay("{MeasureName.Name,nq}")]
     public class Measure
     {
         public Table Table { get; set; }
diff --git a/src/Dax.Metadata/Partition.cs b/src/Dax.Metadata/Partition.cs
index c76d0f4..8c51dc1 100644
--- a/src/Dax.Metadata/Partition.cs
+++ b/src/Dax.Metadata/Partition.cs
@@ -1,11 +1,9 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Diagnostics;
 
 namespace Dax.Metadata
 {
+    [DebuggerDisplay("{PartitionName.Name,nq}")]
     public class Partition
     {
         public enum PartitionState
diff --git a/src/Dax.Metadata/Role.cs b/src/Dax.Metadata/Role.cs
index 70bc727..5193675 100644
--- a/src/Dax.Metadata/Role.cs
+++ b/src/Dax.Metadata/Role.cs
@@ -1,9 +1,11 @@
 using System.Collections.Generic;
 using Newtonsoft.Json;
 using System.Runtime.Serialization;
+using System.Diagnostics;
 
 namespace Dax.Metadata
 {
+    [DebuggerDisplay("{RoleName.Name,nq}")]
     public class Role
     {
         [JsonIgnore]
diff --git a/src/Dax.Metadata/Table.cs b/src/Dax.Metadata/Table.cs
index f5158bd..f11d73f 100644
--- a/src/Dax.Metadata/Table.cs
+++ b/src/Dax.Metadata/Table.cs
@@ -2,9 +2,11 @@
 using System.Linq;
 using Newtonsoft.Json;
 using System.Runtime.Serialization;
+using System.Diagnostics;
 
 namespace Dax.Metadata
 {
+    [DebuggerDisplay("{TableName.Name,nq}")]
     [JsonObject(IsReference =true)]
     public class Table
     {
diff --git a/src/Dax.Metadata/UserHierarchy.cs b/src/Dax.Metadata/UserHierarchy.cs
index 32e7f5c..1861d83 100644
--- a/src/Dax.Metadata/UserHierarchy.cs
+++ b/src/Dax.Metadata/UserHierarchy.cs
@@ -1,11 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Diagnostics;
 
 namespace Dax.Metadata
 {
+    [DebuggerDisplay("{HierarchyName.Name,nq}")]
     public class UserHierarchy
     {
         public Table Table { get; set; }