diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_12.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_11_3.java
similarity index 83%
rename from achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_12.java
rename to achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_11_3.java
index 3dec03228..54d77d2aa 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_12.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_11_3.java
@@ -16,16 +16,16 @@
 
 package info.archinnov.achilles.internals.cassandra_version;
 
-public class V3_12 extends V3_10 {
+public class V3_11_3 extends V3_10 {
 
 
-    public static V3_12 INSTANCE = new V3_12();
+    public static V3_11_3 INSTANCE = new V3_11_3();
 
-    protected V3_12() {
+    protected V3_11_3() {
     }
 
     @Override
     public String version() {
-        return "3.12";
+        return "3.11.3";
     }
 }
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_11_4.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_11_4.java
new file mode 100644
index 000000000..de76477f7
--- /dev/null
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/cassandra_version/V3_11_4.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2012-2019 DuyHai DOAN
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package info.archinnov.achilles.internals.cassandra_version;
+
+public class V3_11_4 extends V3_10 {
+
+
+    public static V3_11_4 INSTANCE = new V3_11_4();
+
+    protected V3_11_4() {
+    }
+
+    @Override
+    public String version() {
+        return "3.11.4";
+    }
+}
diff --git a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/GlobalParsingContext.java b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/GlobalParsingContext.java
index df3523bc8..11e870689 100644
--- a/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/GlobalParsingContext.java
+++ b/achilles-core/src/main/java/info/archinnov/achilles/internals/parser/context/GlobalParsingContext.java
@@ -84,7 +84,8 @@ public class GlobalParsingContext {
         VERSION_MAPPING.put(CASSANDRA_3_11_0, V3_11_0.INSTANCE);
         VERSION_MAPPING.put(CASSANDRA_3_11_1, V3_11_1.INSTANCE);
         VERSION_MAPPING.put(CASSANDRA_3_11_2, V3_11_2.INSTANCE);
-        VERSION_MAPPING.put(CASSANDRA_3_12, V3_12.INSTANCE);
+        VERSION_MAPPING.put(CASSANDRA_3_11_3, V3_11_3.INSTANCE);
+        VERSION_MAPPING.put(CASSANDRA_3_11_4, V3_11_4.INSTANCE);
         VERSION_MAPPING.put(DSE_4_8_X, info.archinnov.achilles.internals.cassandra_version.DSE_4_8_X.INSTANCE);
         VERSION_MAPPING.put(DSE_5_0_0, info.archinnov.achilles.internals.cassandra_version.DSE_5_0_0.INSTANCE);
         VERSION_MAPPING.put(DSE_5_0_1, info.archinnov.achilles.internals.cassandra_version.DSE_5_0_1.INSTANCE);
diff --git a/achilles-model/src/main/java/info/archinnov/achilles/type/CassandraVersion.java b/achilles-model/src/main/java/info/archinnov/achilles/type/CassandraVersion.java
index 1f5ac4b45..81b3d1d5a 100644
--- a/achilles-model/src/main/java/info/archinnov/achilles/type/CassandraVersion.java
+++ b/achilles-model/src/main/java/info/archinnov/achilles/type/CassandraVersion.java
@@ -337,7 +337,8 @@ public enum CassandraVersion {
     CASSANDRA_3_11_0,
     CASSANDRA_3_11_1,
     CASSANDRA_3_11_2,
-    CASSANDRA_3_12,
+    CASSANDRA_3_11_3,
+    CASSANDRA_3_11_4,
 
     /**
      * Feature:
diff --git a/pom.xml b/pom.xml
index 324ae2785..353be1497 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,7 +91,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <cassandra.version>3.11.3</cassandra.version>
+        <cassandra.version>3.11.4</cassandra.version>
         <datastax.driver.core.version>3.6.0</datastax.driver.core.version>
         <fasterxml.jackson.version>2.9.9</fasterxml.jackson.version>
         <commons.lang.version>3.3.2</commons.lang.version>