diff --git a/src/main/java/org/spin/eca56/util/support/documents/ReferenceValues.java b/src/main/java/org/spin/eca56/util/support/documents/ReferenceValues.java
index 64d1362..cfac891 100644
--- a/src/main/java/org/spin/eca56/util/support/documents/ReferenceValues.java
+++ b/src/main/java/org/spin/eca56/util/support/documents/ReferenceValues.java
@@ -27,6 +27,7 @@ public class ReferenceValues {
 	private int referenceId;
 	
 	private ReferenceValues(int referenceId, String tableName, String embeddedContextColumn) {
+		this.referenceId = referenceId;
 		this.tableName = tableName;
 		this.embeddedContextColumn = embeddedContextColumn;
 	}
@@ -46,4 +47,5 @@ public String getEmbeddedContextColumn() {
 	public int getReferenceId() {
 		return referenceId;
 	}
+
 }
diff --git a/src/main/java/org/spin/eca56/util/support/documents/Window.java b/src/main/java/org/spin/eca56/util/support/documents/Window.java
index 842eef9..d0b6418 100644
--- a/src/main/java/org/spin/eca56/util/support/documents/Window.java
+++ b/src/main/java/org/spin/eca56/util/support/documents/Window.java
@@ -453,7 +453,12 @@ private Map<String, Object> parseField(MField field) {
 			validationRuleId = column.getAD_Val_Rule_ID();
 		}
 
-		ReferenceValues referenceValues = ReferenceUtil.getReferenceDefinition(column.getColumnName(), displayTypeId, referenceValueId, validationRuleId);
+		ReferenceValues referenceValues = ReferenceUtil.getReferenceDefinition(
+			column.getColumnName(),
+			displayTypeId,
+			referenceValueId,
+			validationRuleId
+		);
 		if(referenceValues != null) {
 			Map<String, Object> referenceDetail = new HashMap<>();
 			referenceDetail.put("table_name", referenceValues.getTableName());