diff --git a/codegen-cli/pom.xml b/codegen-cli/pom.xml
index fa1c7e47e..428602d8d 100644
--- a/codegen-cli/pom.xml
+++ b/codegen-cli/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-codegen</artifactId>
-        <version>1.5.12</version>
+        <version>1.5.13</version>
         <relativePath>..</relativePath>
     </parent>
 
diff --git a/codegen-core/pom.xml b/codegen-core/pom.xml
index a281bffba..86a2e01a8 100644
--- a/codegen-core/pom.xml
+++ b/codegen-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-codegen</artifactId>
-        <version>1.5.12</version>
+        <version>1.5.13</version>
         <relativePath>..</relativePath>
     </parent>
 
diff --git a/codegen-fwk/pom.xml b/codegen-fwk/pom.xml
index 422bedb30..1bdb77702 100644
--- a/codegen-fwk/pom.xml
+++ b/codegen-fwk/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-codegen</artifactId>
-        <version>1.5.12</version>
+        <version>1.5.13</version>
         <relativePath>..</relativePath>
     </parent>
 
diff --git a/codegen-web/pom.xml b/codegen-web/pom.xml
index 1f413cabf..3a23d11da 100644
--- a/codegen-web/pom.xml
+++ b/codegen-web/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-codegen</artifactId>
-        <version>1.5.12</version>
+        <version>1.5.13</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -58,6 +58,10 @@
             <groupId>com.networknt</groupId>
             <artifactId>metrics</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.networknt</groupId>
+            <artifactId>cors</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.networknt</groupId>
             <artifactId>traceability</artifactId>
diff --git a/codegen-web/src/main/resources/config/cors.yml b/codegen-web/src/main/resources/config/cors.yml
index 47a2248b1..fc7155c01 100644
--- a/codegen-web/src/main/resources/config/cors.yml
+++ b/codegen-web/src/main/resources/config/cors.yml
@@ -7,7 +7,7 @@ enabled: true
 allowedOrigins:
 - http://localhost
 # Support for react dev server.
-- http://localhost:3000
+- http://localhost:3001
 # Allowed methods list.
 allowedMethods:
 - GET
diff --git a/codegen-web/src/main/resources/config/service.yml b/codegen-web/src/main/resources/config/service.yml
index ad49b0dc3..70f070fcd 100644
--- a/codegen-web/src/main/resources/config/service.yml
+++ b/codegen-web/src/main/resources/config/service.yml
@@ -21,6 +21,8 @@ singletons:
   - com.networknt.traceability.TraceabilityHandler
   # Correlation Create correlationId if it doesn't exist in the request header and put it into the request header
   - com.networknt.correlation.CorrelationHandler
+  # Cors handler to handler post/put pre-flight
+  - com.networknt.cors.CorsHttpHandler
   # SimpleAudit Log important info about the request into audit log
   - com.networknt.audit.AuditHandler
 # Generator interface implementations
diff --git a/light-graphql-4j/pom.xml b/light-graphql-4j/pom.xml
index 6bfcd6ec7..c9554a13c 100644
--- a/light-graphql-4j/pom.xml
+++ b/light-graphql-4j/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-codegen</artifactId>
-        <version>1.5.12</version>
+        <version>1.5.13</version>
         <relativePath>..</relativePath>
     </parent>
 
diff --git a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw
index 659ca6dcb..85d06dd66 100644
--- a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw
+++ b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw
@@ -11,20 +11,18 @@
     <properties>
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <version.light-4j>1.5.12</version.light-4j>
-        <version.light-graphql-4j>1.5.12</version.light-graphql-4j>
-        <version.jackson>2.9.4</version.jackson>
+        <version.light-4j>1.5.13</version.light-4j>
+        <version.light-graphql-4j>1.5.13</version.light-graphql-4j>
+        <version.jackson>2.9.5</version.jackson>
         <version.slf4j>1.7.25</version.slf4j>
-        <version.jose4j>0.6.1</version.jose4j>
-        <version.antlr4>4.7</version.antlr4>
-        <version.encoder>1.2.1</version.encoder>
+        <version.jose4j>0.6.3</version.jose4j>
         <version.logback>1.2.3</version.logback>
         <version.junit>4.12</version.junit>
-        <version.undertow>1.4.20.Final</version.undertow>
-        <version.graphql>4.2</version.graphql>
+        <version.undertow>1.4.23.Final</version.undertow>
+        <version.graphql>8.0</version.graphql>
         <version.rxjava>2.1.5</version.rxjava>
         @if(config.toBoolean("supportDb") || config.toBoolean("supportH2ForTest")){
-        <version.hikaricp>2.6.2</version.hikaricp>
+        <version.hikaricp>3.0.0</version.hikaricp>
         }
         @if(config.toBoolean("supportDb") && "oracle".equalsIgnoreCase(config.toString("dbInfo", "name"))){
         <version.oracle>11.2.0.3</version.oracle>
diff --git a/light-hybrid-4j/pom.xml b/light-hybrid-4j/pom.xml
index fad6a5cce..fa6fa0cf9 100644
--- a/light-hybrid-4j/pom.xml
+++ b/light-hybrid-4j/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-codegen</artifactId>
-        <version>1.5.12</version>
+        <version>1.5.13</version>
         <relativePath>..</relativePath>
     </parent>
 
diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw
index c7eff5ea1..bcea11afa 100644
--- a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw
+++ b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw
@@ -11,23 +11,21 @@
     <properties>
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <version.light-4j>1.5.12</version.light-4j>
-        <version.light-hybrid-4j>1.5.12</version.light-hybrid-4j>
+        <version.light-4j>1.5.13</version.light-4j>
+        <version.light-hybrid-4j>1.5.13</version.light-hybrid-4j>
         @if(config.toBoolean("eventuateQuerySupport") || config.toBoolean("eventuateCommandSupport")){
-        <version.light-eventuate-4j>1.5.12</version.light-eventuate-4j>
+        <version.light-eventuate-4j>1.5.13</version.light-eventuate-4j>
         }
-        <version.jackson>2.9.4</version.jackson>
+        <version.jackson>2.9.5</version.jackson>
         <version.slf4j>1.7.25</version.slf4j>
-        <version.jose4j>0.6.1</version.jose4j>
-        <version.antlr4>4.7</version.antlr4>
-        <version.encoder>1.2.1</version.encoder>
+        <version.jose4j>0.6.3</version.jose4j>
         <version.logback>1.2.3</version.logback>
         <version.junit>4.12</version.junit>
-        <version.undertow>1.4.20.Final</version.undertow>
-        <version.json-schema-validator>0.1.15</version.json-schema-validator>
-        <version.fastscanner>2.7.0</version.fastscanner>
+        <version.undertow>1.4.23.Final</version.undertow>
+        <version.json-schema-validator>0.1.18</version.json-schema-validator>
+        <version.fastscanner>2.18.1</version.fastscanner>
         @if(config.toBoolean("supportDb") || config.toBoolean("supportH2ForTest")){
-        <version.hikaricp>2.6.2</version.hikaricp>
+        <version.hikaricp>3.0.0</version.hikaricp>
         }
         @if(config.toBoolean("supportDb") && "oracle".equalsIgnoreCase(config.toString("dbInfo", "name"))){
         <version.oracle>11.2.0.3</version.oracle>
diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw
index b09dcf40e..1b70b2e53 100644
--- a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw
+++ b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw
@@ -11,23 +11,21 @@
     <properties>
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <version.light-4j>1.5.12</version.light-4j>
-        <version.light-hybrid-4j>1.5.12</version.light-hybrid-4j>
+        <version.light-4j>1.5.13</version.light-4j>
+        <version.light-hybrid-4j>1.5.13</version.light-hybrid-4j>
         @if(config.toBoolean("eventuateQuerySupport") || config.toBoolean("eventuateCommandSupport")){
-        <version.light-eventuate-4j>1.5.12</version.light-eventuate-4j>
+        <version.light-eventuate-4j>1.5.13</version.light-eventuate-4j>
         }
-        <version.jackson>2.9.4</version.jackson>
+        <version.jackson>2.9.5</version.jackson>
         <version.slf4j>1.7.25</version.slf4j>
-        <version.jose4j>0.6.1</version.jose4j>
-        <version.antlr4>4.7</version.antlr4>
-        <version.encoder>1.2.1</version.encoder>
+        <version.jose4j>0.6.3</version.jose4j>
         <version.logback>1.2.3</version.logback>
         <version.junit>4.12</version.junit>
-        <version.undertow>1.4.20.Final</version.undertow>
-        <version.json-schema-validator>0.1.15</version.json-schema-validator>
-        <version.fastscanner>2.7.0</version.fastscanner>
+        <version.undertow>1.4.23.Final</version.undertow>
+        <version.json-schema-validator>0.1.18</version.json-schema-validator>
+        <version.fastscanner>2.18.1</version.fastscanner>
         @if(config.toBoolean("supportDb") || config.toBoolean("supportH2ForTest")){
-        <version.hikaricp>2.6.2</version.hikaricp>
+        <version.hikaricp>3.0.0</version.hikaricp>
         }
         @if(config.toBoolean("supportDb") && "oracle".equalsIgnoreCase(config.toString("dbInfo", "name"))){
         <version.oracle>11.2.0.3</version.oracle>
diff --git a/light-rest-4j/pom.xml b/light-rest-4j/pom.xml
index 819ab82a9..4f3950789 100644
--- a/light-rest-4j/pom.xml
+++ b/light-rest-4j/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.networknt</groupId>
         <artifactId>light-codegen</artifactId>
-        <version>1.5.12</version>
+        <version>1.5.13</version>
         <relativePath>..</relativePath>
     </parent>
 
diff --git a/light-rest-4j/src/main/resources/templates/rest/openapi/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/openapi/pom.xml.rocker.raw
index e839895d2..d4d98d0b3 100644
--- a/light-rest-4j/src/main/resources/templates/rest/openapi/pom.xml.rocker.raw
+++ b/light-rest-4j/src/main/resources/templates/rest/openapi/pom.xml.rocker.raw
@@ -11,26 +11,22 @@
     <properties>
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <version.light-4j>1.5.12</version.light-4j>
-        <version.light-rest-4j>1.5.12</version.light-rest-4j>
+        <version.light-4j>1.5.13</version.light-4j>
+        <version.light-rest-4j>1.5.13</version.light-rest-4j>
         @if(config.toBoolean("eventuateQuerySupport") || config.toBoolean("eventuateCommandSupport")){
-        <version.light-eventuate-4j>1.5.12</version.light-eventuate-4j>
+        <version.light-eventuate-4j>1.5.13</version.light-eventuate-4j>
         }
-
-        <version.openapi-parser>1.5.12</version.openapi-parser>
-        <version.jackson>2.9.4</version.jackson>
+        <version.openapi-parser>1.5.13</version.openapi-parser>
+        <version.jackson>2.9.5</version.jackson>
         <version.slf4j>1.7.25</version.slf4j>
-        <version.jose4j>0.6.1</version.jose4j>
-        <version.antlr4>4.7</version.antlr4>
-        <version.commons-text>1.1</version.commons-text>
-        <version.encoder>1.2.1</version.encoder>
+        <version.jose4j>0.6.3</version.jose4j>
         <version.logback>1.2.3</version.logback>
         <version.junit>4.12</version.junit>
-        <version.undertow>1.4.20.Final</version.undertow>
-        <version.json-schema-validator>0.1.15</version.json-schema-validator>
-        <version.fastscanner>2.7.0</version.fastscanner>
+        <version.undertow>1.4.23.Final</version.undertow>
+        <version.json-schema-validator>0.1.18</version.json-schema-validator>
+        <version.fastscanner>2.18.1</version.fastscanner>
         @if(config.toBoolean("supportDb") || config.toBoolean("supportH2ForTest")){
-        <version.hikaricp>2.6.2</version.hikaricp>
+        <version.hikaricp>3.0.0</version.hikaricp>
         }
         @if(config.toBoolean("supportDb") && "oracle".equalsIgnoreCase(config.toString("dbInfo", "name"))){
         <version.oracle>11.2.0.3</version.oracle>
@@ -244,11 +240,6 @@
             <artifactId>logback-classic</artifactId>
             <version>${version.logback}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-text</artifactId>
-            <version>${version.commons-text}</version>
-        </dependency>
         <dependency>
             <groupId>io.undertow</groupId>
             <artifactId>undertow-core</artifactId>
diff --git a/light-rest-4j/src/main/resources/templates/rest/swagger/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/swagger/pom.xml.rocker.raw
index 164587c9c..87d112394 100644
--- a/light-rest-4j/src/main/resources/templates/rest/swagger/pom.xml.rocker.raw
+++ b/light-rest-4j/src/main/resources/templates/rest/swagger/pom.xml.rocker.raw
@@ -11,25 +11,22 @@
     <properties>
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <version.light-4j>1.5.12</version.light-4j>
-        <version.light-rest-4j>1.5.12</version.light-rest-4j>
-        <version.jackson>2.9.4</version.jackson>
+        <version.light-4j>1.5.13</version.light-4j>
+        <version.light-rest-4j>1.5.13</version.light-rest-4j>
+        <version.jackson>2.9.5</version.jackson>
         @if(config.toBoolean("eventuateQuerySupport") || config.toBoolean("eventuateCommandSupport")){
-        <version.light-eventuate-4j>1.5.12</version.light-eventuate-4j>
+        <version.light-eventuate-4j>1.5.13</version.light-eventuate-4j>
         }
         <version.slf4j>1.7.25</version.slf4j>
-        <version.jose4j>0.6.1</version.jose4j>
-        <version.antlr4>4.7</version.antlr4>
-        <version.commons-text>1.1</version.commons-text>
-        <version.encoder>1.2.1</version.encoder>
+        <version.jose4j>0.6.3</version.jose4j>
         <version.logback>1.2.3</version.logback>
         <version.junit>4.12</version.junit>
-        <version.undertow>1.4.20.Final</version.undertow>
-        <version.swagger>1.0.32</version.swagger>
-        <version.json-schema-validator>0.1.15</version.json-schema-validator>
-        <version.fastscanner>2.7.0</version.fastscanner>
+        <version.undertow>1.4.23.Final</version.undertow>
+        <version.swagger-parser>1.0.34</version.swagger-parser>
+        <version.json-schema-validator>0.1.18</version.json-schema-validator>
+        <version.fastscanner>2.18.1</version.fastscanner>
         @if(config.toBoolean("supportDb") || config.toBoolean("supportH2ForTest")){
-        <version.hikaricp>2.6.2</version.hikaricp>
+        <version.hikaricp>3.0.0</version.hikaricp>
         }
         @if(config.toBoolean("supportDb") && "oracle".equalsIgnoreCase(config.toString("dbInfo", "name"))){
         <version.oracle>11.2.0.3</version.oracle>
@@ -187,7 +184,7 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-parser</artifactId>
-            <version>${version.swagger}</version>
+            <version>${version.swagger-parser}</version>
         </dependency>
 
         @if(config.toBoolean("eventuateQuerySupport") || config.toBoolean("eventuateCommandSupport")){
@@ -242,11 +239,6 @@
             <artifactId>logback-classic</artifactId>
             <version>${version.logback}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-text</artifactId>
-            <version>${version.commons-text}</version>
-        </dependency>
         <dependency>
             <groupId>io.undertow</groupId>
             <artifactId>undertow-core</artifactId>
diff --git a/pom.xml b/pom.xml
index b92620082..9572d6b0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.networknt</groupId>
     <artifactId>light-codegen</artifactId>
-    <version>1.5.12</version>
+    <version>1.5.13</version>
     <packaging>pom</packaging>
     <name>Parent POM</name>
     <description>Light Code Generator</description>
@@ -66,37 +66,37 @@
     <properties>
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <version.light-4j>1.5.12</version.light-4j>
-        <version.light-hybrid-4j>1.5.12</version.light-hybrid-4j>
-        <version.light-rest-4j>1.5.12</version.light-rest-4j>
-        <version.openapi-parser>1.5.12</version.openapi-parser>
+        <version.light-4j>1.5.13</version.light-4j>
+        <version.light-hybrid-4j>1.5.13</version.light-hybrid-4j>
+        <version.light-rest-4j>1.5.13</version.light-rest-4j>
+        <version.openapi-parser>1.5.13</version.openapi-parser>
         <version.jsoniter>0.9.15</version.jsoniter>
         <version.javassist>3.21.0-GA</version.javassist>
         <version.slf4j>1.7.25</version.slf4j>
-        <version.jose4j>0.6.1</version.jose4j>
+        <version.jose4j>0.6.3</version.jose4j>
         <version.antlr4>4.7</version.antlr4>
-        <version.commons-text>1.1</version.commons-text>
+        <version.commons-text>1.3</version.commons-text>
         <version.commons.io>2.5</version.commons.io>
-        <version.commons.codec>1.10</version.commons.codec>
+        <version.commons.codec>1.11</version.commons.codec>
         <version.encoder>1.2.1</version.encoder>
         <version.logback>1.2.3</version.logback>
         <version.junit>4.12</version.junit>
-        <version.undertow>1.4.20.Final</version.undertow>
-        <version.swagger>1.0.32</version.swagger>
+        <version.undertow>1.4.23.Final</version.undertow>
+        <version.swagger-parser>1.0.34</version.swagger-parser>
         <version.hamcrest>1.3</version.hamcrest>
         <version.assertj>3.8.0</version.assertj>
         <version.hdrhistogram>2.1.10</version.hdrhistogram>
         <version.jsr305>3.0.2</version.jsr305>
-        <version.json-schema-validator>0.1.15</version.json-schema-validator>
+        <version.json-schema-validator>0.1.18</version.json-schema-validator>
         <version.consul>1.2.4</version.consul>
         <version.zookeeper>3.5.3-beta</version.zookeeper>
         <version.zkclient>0.3</version.zkclient>
         <version.curator>4.0.0</version.curator>
-        <version.snakeyaml>1.18</version.snakeyaml>
+        <version.snakeyaml>1.20</version.snakeyaml>
         <version.rocker>0.22.0</version.rocker>
         <version.jcommander>1.72</version.jcommander>
-        <version.fastscanner>2.7.0</version.fastscanner>
-        <version.graphql>4.2</version.graphql>
+        <version.fastscanner>2.18.1</version.fastscanner>
+        <version.graphql>8.0</version.graphql>
         <versions.maven-version>2.4</versions.maven-version>
         <argLine>-Xmx512m -XX:MaxPermSize=256m</argLine>
     </properties>
@@ -171,6 +171,11 @@
                 <artifactId>metrics</artifactId>
                 <version>${version.light-4j}</version>
             </dependency>
+            <dependency>
+                <groupId>com.networknt</groupId>
+                <artifactId>cors</artifactId>
+                <version>${version.light-4j}</version>
+            </dependency>
             <dependency>
                 <groupId>com.networknt</groupId>
                 <artifactId>correlation</artifactId>