diff --git a/tools/model_generator/genmodel.jar b/tools/model_generator/genmodel.jar
index a00927c6..2da7859e 100644
Binary files a/tools/model_generator/genmodel.jar and b/tools/model_generator/genmodel.jar differ
diff --git a/tools/model_generator/src/com/libiec61850/scl/model/DataModelValue.java b/tools/model_generator/src/com/libiec61850/scl/model/DataModelValue.java
index 1d4fb21a..2b0da485 100644
--- a/tools/model_generator/src/com/libiec61850/scl/model/DataModelValue.java
+++ b/tools/model_generator/src/com/libiec61850/scl/model/DataModelValue.java
@@ -1,5 +1,7 @@
 package com.libiec61850.scl.model;
 
+import java.text.SimpleDateFormat;
+
 /*
  *  DataModelValue.java
  *
@@ -24,6 +26,7 @@ package com.libiec61850.scl.model;
  */
 
 import java.util.Base64;
+import java.util.Date;
 
 import com.libiec61850.scl.types.EnumerationType;
 import com.libiec61850.scl.types.IllegalValueException;
@@ -162,6 +165,25 @@ public class DataModelValue {
         	this.value = null;
         	System.out.println("Warning: Initialization of QUALITY is unsupported!");
         	break;
+        	
+        case TIMESTAMP:
+        case ENTRY_TIME:
+            try {
+                String modValueString = value.replace(',', '.');
+                
+                SimpleDateFormat parser = new SimpleDateFormat("yyyy-MM-d'T'HH:mm:ss.SSS");
+                
+                Date date = parser.parse(modValueString);
+                
+                this.value = new Long(date.toInstant().toEpochMilli());
+            }
+            catch (java.text.ParseException e) {
+                this.value = null;
+                System.out.println("Warning: Val element does not contain a valid time stamp: " + e.getMessage()); 
+            }
+        
+            break;
+        	
         default:
             throw new IllegalValueException("Unsupported type " + type.toString() + " value: " + value);
         }
diff --git a/tools/model_generator/src/com/libiec61850/tools/StaticModelGenerator.java b/tools/model_generator/src/com/libiec61850/tools/StaticModelGenerator.java
index 2db231b4..c790ed6a 100644
--- a/tools/model_generator/src/com/libiec61850/tools/StaticModelGenerator.java
+++ b/tools/model_generator/src/com/libiec61850/tools/StaticModelGenerator.java
@@ -805,6 +805,11 @@ public class StaticModelGenerator {
         case FLOAT64:
             buffer.append("MmsValue_newDouble(" + value.getValue() + ");");
             break;
+            
+        case TIMESTAMP:
+            buffer.append("MmsValue_newUtcTimeByMsTime("+ value.getValue() + ");");
+            break;
+            
         default:
             System.out.println("Unknown default value for " + daName + " type: " + dataAttribute.getType());
             buffer.append("NULL;");