diff --git a/extension/event-store-mem/src/main/java/org/keycloak/quickstart/event/storage/MemAdminEventQuery.java b/extension/event-store-mem/src/main/java/org/keycloak/quickstart/event/storage/MemAdminEventQuery.java
index cd61a54f4..8e73e5fd1 100755
--- a/extension/event-store-mem/src/main/java/org/keycloak/quickstart/event/storage/MemAdminEventQuery.java
+++ b/extension/event-store-mem/src/main/java/org/keycloak/quickstart/event/storage/MemAdminEventQuery.java
@@ -153,9 +153,14 @@ public AdminEventQuery resourcePath(String resourcePath) {
 
     @Override
     public AdminEventQuery fromTime(Date fromTime) {
+        return fromTime(fromTime.getTime());
+    }
+
+
+    public AdminEventQuery fromTime(long fromTime) {
         Iterator<AdminEvent> itr = this.adminEvents.iterator();
         while (itr.hasNext()) {
-            if (!(itr.next().getTime() >= fromTime.getTime())) {
+            if (!(itr.next().getTime() >= fromTime)) {
                 itr.remove();
             }
         }
@@ -164,9 +169,14 @@ public AdminEventQuery fromTime(Date fromTime) {
 
     @Override
     public AdminEventQuery toTime(Date toTime) {
+        return toTime(toTime.getTime());
+    }
+
+    
+    public AdminEventQuery toTime(long toTime) {
         Iterator<AdminEvent> itr = this.adminEvents.iterator();
         while (itr.hasNext()) {
-            if (!(itr.next().getTime() <= toTime.getTime())) {
+            if (!(itr.next().getTime() <= toTime)) {
                 itr.remove();
             }
         }
diff --git a/extension/event-store-mem/src/main/java/org/keycloak/quickstart/event/storage/MemEventQuery.java b/extension/event-store-mem/src/main/java/org/keycloak/quickstart/event/storage/MemEventQuery.java
index 12156dbd1..f9d3464a0 100755
--- a/extension/event-store-mem/src/main/java/org/keycloak/quickstart/event/storage/MemEventQuery.java
+++ b/extension/event-store-mem/src/main/java/org/keycloak/quickstart/event/storage/MemEventQuery.java
@@ -93,23 +93,33 @@ public EventQuery user(String userId) {
         }
         return this;
     }
-    
+
     @Override
     public EventQuery fromDate(Date fromDate) {
+        return fromDate(fromDate.getTime());
+    }
+
+
+    public EventQuery fromDate(long fromDate) {
         Iterator<Event> itr = this.events.iterator();
         while (itr.hasNext()) {
-            if (!(itr.next().getTime() >= fromDate.getTime())) {
+            if (!(itr.next().getTime() >= fromDate)) {
                 itr.remove();
             }
         }
         return this;
     }
-    
+
     @Override
     public EventQuery toDate(Date toDate) {
+        return toDate(toDate.getTime());
+    }
+
+
+    public EventQuery toDate(long toDate) {
         Iterator<Event> itr = this.events.iterator();
         while (itr.hasNext()) {
-            if (!(itr.next().getTime() <= toDate.getTime())) {
+            if (!(itr.next().getTime() <= toDate)) {
                 itr.remove();
             }
         }
diff --git a/spring/rest-authz-resource-server/src/main/java/org/keycloak/quickstart/OAuth2ResourceServerSecurityConfiguration.java b/spring/rest-authz-resource-server/src/main/java/org/keycloak/quickstart/OAuth2ResourceServerSecurityConfiguration.java
index 888a6bfb8..3bd8f5078 100644
--- a/spring/rest-authz-resource-server/src/main/java/org/keycloak/quickstart/OAuth2ResourceServerSecurityConfiguration.java
+++ b/spring/rest-authz-resource-server/src/main/java/org/keycloak/quickstart/OAuth2ResourceServerSecurityConfiguration.java
@@ -23,7 +23,6 @@
 import org.keycloak.adapters.authorization.spi.ConfigurationResolver;
 import org.keycloak.adapters.authorization.spi.HttpRequest;
 import org.keycloak.representations.adapters.config.PolicyEnforcerConfig;
-import org.keycloak.util.SystemPropertiesJsonParserFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -64,7 +63,7 @@ private ServletPolicyEnforcerFilter createPolicyEnforcerFilter() {
 		PolicyEnforcerConfig config;
 
 		try {
-			ObjectMapper mapper = new ObjectMapper(new SystemPropertiesJsonParserFactory());
+			ObjectMapper mapper = new ObjectMapper();
 			mapper.setSerializationInclusion(JsonInclude.Include.NON_DEFAULT);
 			config = mapper.readValue(getClass().getResourceAsStream("/policy-enforcer.json"), PolicyEnforcerConfig.class);
 		} catch (IOException e) {