--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/templating/TypeConverter.java	Mon Oct 21 12:21:40 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/templating/TypeConverter.java	Mon Oct 21 17:43:01 2013 +0200
@@ -8,8 +8,14 @@
 
 package org.dive4elements.river.artifacts.datacage.templating;
 
+import java.util.Date;
+
+import org.apache.log4j.Logger;
+
 public class TypeConverter
 {
+    private static Logger log = Logger.getLogger(TypeConverter.class);
+
     private TypeConverter() {
     }
 
@@ -19,18 +25,33 @@
             return object;
         }
 
-        if ("Integer".equals(type)) {
+        type = type.toLowerCase();
+
+        if ("integer".equals(type)) {
             return Integer.valueOf(object.toString());
         }
 
-        if ("Double".equals(type)) {
+        if ("double".equals(type)) {
             return Double.valueOf(object.toString());
         }
 
-        if ("String".equals(type)) {
+        if ("string".equals(type)) {
             return object.toString();
         }
 
+        if ("date".equals(type)) {
+            if (object instanceof Date) {
+                return object;
+            }
+            try {
+                return new Date((long)Double.parseDouble(object.toString()));
+            }
+            catch (NumberFormatException nfe) {
+                log.warn(nfe);
+                return null;
+            }
+        }
+
         // TODO: Add more types
 
         return object;