diff --git a/src/main/java/com/wurrly/controllers/Users.java b/src/main/java/com/wurrly/controllers/Users.java
index 0f83ebd..e02eb32 100644
--- a/src/main/java/com/wurrly/controllers/Users.java
+++ b/src/main/java/com/wurrly/controllers/Users.java
@@ -72,7 +72,7 @@ public Any userType(
 	                    @QueryParam("optionalQueryString")  Optional<String> optionalQueryString, 
 	                    @QueryParam("optionalLong")  Optional<Long> optionalLong, 
 	                    @QueryParam("longValue")   Long  longValue, 
-	                    @QueryParam("date") @ApiParam(format="date")  Date  dateValue, 
+	                    @QueryParam("dateValue") @ApiParam(format="date")  Optional<Date>  dateValue, 
 	                    @QueryParam("numbers")    List<Integer>  numbers, 
 
 	                      @QueryParam("queryFromString") UUID queryFromString, 
@@ -95,6 +95,7 @@ public Any userType(
  log.debug("queryEnum: " + queryEnum);
  log.debug("optionalQueryEnum: " + optionalQueryEnum);
  log.debug("userId: " + userId);
+ log.debug("numbers: " + numbers);
 
 
 //				
diff --git a/src/main/java/com/wurrly/server/Extractors.java b/src/main/java/com/wurrly/server/Extractors.java
index a3bd2e5..92edcfd 100644
--- a/src/main/java/com/wurrly/server/Extractors.java
+++ b/src/main/java/com/wurrly/server/Extractors.java
@@ -67,6 +67,12 @@ public static  <T> java.util.Optional<T> typed(final HttpServerExchange exchange
 			});
 		}
 
+		public static java.util.Optional<Date> date(final HttpServerExchange exchange,final String name)  {
+			  
+			  
+			 return string(exchange, name).map( ZonedDateTime::parse ).map(ZonedDateTime::toInstant).map(Date::from);
+			    
+		}
 
 		public static java.util.Optional<Any> any(final HttpServerExchange exchange )
 		{
diff --git a/src/main/java/com/wurrly/server/handlers/HandlerGenerator.java b/src/main/java/com/wurrly/server/handlers/HandlerGenerator.java
index 2ee0d14..506587e 100644
--- a/src/main/java/com/wurrly/server/handlers/HandlerGenerator.java
+++ b/src/main/java/com/wurrly/server/handlers/HandlerGenerator.java
@@ -110,7 +110,8 @@ public enum TypeHandler
 		OptionalFloatType("$T<Long> $L = $T.floatValue(exchange,$S)", false,   Optional.class, StatementParameterType.LITERAL, com.wurrly.server.Extractors.Optional.class, StatementParameterType.STRING),
 		OptionalDoubleType("$T<Integer> $L = $T.doubleValue(exchange,$S)", false,  Optional.class,  StatementParameterType.LITERAL, com.wurrly.server.Extractors.Optional.class, StatementParameterType.STRING),
 		
-		
+		OptionalDateType("$T<$T> $L = $T.date(exchange,$S)", false,  Optional.class, java.util.Date.class,  StatementParameterType.LITERAL, com.wurrly.server.Extractors.Optional.class, StatementParameterType.STRING),
+
 		OptionalModelType("java.util.Optional<$L> $L = $T.typed(exchange,$L)", true,   StatementParameterType.LITERAL, StatementParameterType.LITERAL, com.wurrly.server.Extractors.Optional.class, StatementParameterType.LITERAL),
 
 		OptionalValueOfType("$T<$T> $L = $T.string(exchange,$S).map($T::valueOf)", false, Optional.class, StatementParameterType.RAW, StatementParameterType.LITERAL,com.wurrly.server.Extractors.Optional.class, StatementParameterType.STRING, StatementParameterType.RAW),
@@ -182,7 +183,7 @@ else if (handler.parameterTypes[i] instanceof Class)
  				}  
 			}
 
-			log.debug("type: " + parameter.getParameterizedType().getTypeName() + " : " + handler);
+			log.info("type: " + parameter.getParameterizedType().getTypeName() + " : " + handler);
 			builder.addStatement(handler.statement, args);
 		}
 		
@@ -281,6 +282,10 @@ else if (type.getTypeName().contains("java.lang.String"))
 				{
 					return OptionalStringType;
 				}
+				else if (type.getTypeName().contains("java.util.Date"))
+				{
+					return OptionalDateType;
+				}
 				else if (type.getTypeName().contains("java.lang.Boolean"))
 				{
 					return OptionalBooleanType;
diff --git a/src/main/resources/swagger/swagger-ui-standalone-preset.js.map b/src/main/resources/swagger/swagger-ui-standalone-preset.js.map
old mode 100644
new mode 100755