diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPDATL b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPDATX
similarity index 91%
rename from src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPDATL
rename to src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPDATX
index ef8cb1236..ce5ddf10b 100644
--- a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPDATL
+++ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPDATX
@@ -1,4 +1,5 @@
-{"name" : "COMPDATL" , "sections" : ["SCHEDULE"], "items" : [
+{"name" : "COMPDATX" , "sections" : ["SCHEDULE"], "deck_names":  ["COMPDATM","COMPDATL"], 
+"items" : [
     {"name" : "WELL" , "value_type" : "STRING"},
     {"name" : "LGR", "value_type" : "STRING"},
     {"name" : "I" , "value_type" : "INT" , "default" : 0},
diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPINJK b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPINJK
new file mode 100644
index 000000000..3df230d93
--- /dev/null
+++ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPINJK
@@ -0,0 +1,11 @@
+{"name" : "COMPINJK" , "sections" : ["SCHEDULE"],  
+"items" : [
+    {"name" : "WELL" , "value_type" : "STRING"},
+    {"name" : "I" , "value_type" : "INT", "default": 0},
+    {"name" : "J" , "value_type" : "INT", "default": 0},
+    {"name" : "K_UPPER" , "value_type" : "INT", "default": 0},
+    {"name" : "K_LOWER" , "value_type" : "INT", "default": 0},
+    {"name" : "REL_PERM" , "value_type" : "DOUBLE", "dimension": "1", "default": 0}
+
+
+]}
diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPRP b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPRP
new file mode 100644
index 000000000..d8a8e8b18
--- /dev/null
+++ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPRP
@@ -0,0 +1,15 @@
+{"name" : "COMPRP" , "sections" : ["SCHEDULE"],  
+"items" : [
+    {"name" : "WELL" , "value_type" : "STRING"},
+    {"name" : "I" , "value_type" : "INT", "default": 0},
+    {"name" : "J" , "value_type" : "INT", "default": 0},
+    {"name" : "K_UPPER" , "value_type" : "INT", "default": 0},
+    {"name" : "K_LOWER" , "value_type" : "INT", "default": 0},
+    {"name" : "SAT_TABLE_NUM" , "value_type" : "INT"},
+    {"name" : "SWMIN" , "value_type" : "DOUBLE", "dimension": "1"},
+    {"name" : "SWMAX" , "value_type" : "DOUBLE", "dimension": "1"},
+    {"name" : "SGMIN" , "value_type" : "DOUBLE", "dimension": "1"},
+    {"name" : "SGMAX" , "value_type" : "DOUBLE", "dimension": "1"}
+
+
+]}
diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPRPL b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPRPL
new file mode 100644
index 000000000..b04d25980
--- /dev/null
+++ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPRPL
@@ -0,0 +1,14 @@
+{"name" : "COMPRPL" , "sections" : ["SCHEDULE"],  
+"items" : [
+    {"name" : "WELL" , "value_type" : "STRING"},
+    {"name" : "LOCAL_GRID" , "value_type" : "STRING"},
+    {"name" : "I" , "value_type" : "INT", "default": 0},
+    {"name" : "J" , "value_type" : "INT", "default": 0},
+    {"name" : "K_UPPER" , "value_type" : "INT", "default": 0},
+    {"name" : "K_LOWER" , "value_type" : "INT", "default": 0},
+    {"name" : "SAT_TABLE_NUM" , "value_type" : "INT"},
+    {"name" : "SWMIN" , "value_type" : "DOUBLE", "dimension": "1"},
+    {"name" : "SWMAX" , "value_type" : "DOUBLE", "dimension": "1"},
+    {"name" : "SGMIN" , "value_type" : "DOUBLE", "dimension": "1"},
+    {"name" : "SGMAX" , "value_type" : "DOUBLE", "dimension": "1"}
+]}
diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPVE b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPVE
new file mode 100644
index 000000000..9f4b673be
--- /dev/null
+++ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPVE
@@ -0,0 +1,16 @@
+{"name" : "COMPVE" , "sections" : ["SCHEDULE"],  
+"items" : [
+    {"name" : "WELL" , "value_type" : "STRING"},
+    {"name" : "I" , "value_type" : "INT", "default": 0},
+    {"name" : "J" , "value_type" : "INT", "default": 0},
+    {"name" : "K_UPPER" , "value_type" : "INT", "default": 0},
+    {"name" : "K_LOWER" , "value_type" : "INT", "default": 0},
+    {"name" : "SAT_TABLE_NUM" , "value_type" : "INT"},
+    {"name" : "CVEFRAC" , "value_type" : "DOUBLE", "dimension": "1"},
+    {"name" : "DTOP" , "value_type" : "DOUBLE", "dimension": "Length"},
+    {"name" : "DBOT" , "value_type" : "DOUBLE", "dimension": "Length"},
+    {"name" : "FLAG" , "value_type" : "STRING", "default": "NO"},
+    {"name" : "S_D" , "value_type" : "DOUBLE", "default": 0.0},
+    {"name" : "GTOP" , "value_type" : "DOUBLE", "dimension": "Length"},
+    {"name" : "GBOT" , "value_type" : "DOUBLE", "dimension": "Length"}
+]}
diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPVEL b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPVEL
new file mode 100644
index 000000000..4e496298a
--- /dev/null
+++ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/COMPVEL
@@ -0,0 +1,17 @@
+{"name" : "COMPVEL" , "sections" : ["SCHEDULE"],  
+"items" : [
+    {"name" : "WELL" , "value_type" : "STRING"},
+    {"name" : "LOCAL" , "value_type" : "STRING"},
+    {"name" : "I" , "value_type" : "INT", "default": 0},
+    {"name" : "J" , "value_type" : "INT", "default": 0},
+    {"name" : "K_UPPER" , "value_type" : "INT", "default": 0},
+    {"name" : "K_LOWER" , "value_type" : "INT", "default": 0},
+    {"name" : "SAT_TABLE_NUM" , "value_type" : "INT"},
+    {"name" : "CVEFRAC" , "value_type" : "DOUBLE", "dimension": "1"},
+    {"name" : "DTOP" , "value_type" : "DOUBLE", "dimension": "Length"},
+    {"name" : "DBOT" , "value_type" : "DOUBLE", "dimension": "Length"},
+    {"name" : "FLAG" , "value_type" : "STRING", "default": "NO"},
+    {"name" : "S_D" , "value_type" : "DOUBLE", "default": 0.0},
+    {"name" : "GTOP" , "value_type" : "DOUBLE", "dimension": "Length"},
+    {"name" : "GBOT" , "value_type" : "DOUBLE", "dimension": "Length"}
+]}
diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/CSKIN b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/CSKIN
new file mode 100644
index 000000000..4dc4dc988
--- /dev/null
+++ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/C/CSKIN
@@ -0,0 +1,11 @@
+{"name" : "CSKIN" , "sections" : ["SCHEDULE"],  
+"items" : [
+    {"name" : "WELL" , "value_type" : "STRING"},
+    {"name" : "I" , "value_type" : "INT", "default": 0},
+    {"name" : "J" , "value_type" : "INT", "default": 0},
+    {"name" : "K_UPPER" , "value_type" : "INT", "default": 0},
+    {"name" : "K_LOWER" , "value_type" : "INT", "default": 0},
+    {"name" : "CONNECTION_SKIN_FACTOR" , "value_type" : "DOUBLE", "dimension": "1", "default": 0.0}
+
+
+]}
diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DEPTHTAB b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DEPTHTAB
new file mode 100644
index 000000000..5c751e192
--- /dev/null
+++ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DEPTHTAB
@@ -0,0 +1,5 @@
+{"name" : "DEPTHTAB" , "sections" : ["PROPS"] , "size" : {"keyword" : "RIVRDIMS" , "item" : "NMDEPT"} , "items" :
+        [
+        {"name" : "DATA" , "value_type":"STRING","size_type":"ALL"}
+        ]
+}
diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFF b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFF
new file mode 100644
index 000000000..6f19fb389
--- /dev/null
+++ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFF
@@ -0,0 +1,2 @@
+{"name" : "DIFF" , "sections" : ["GRID"], "deck_name" : ["DIFFMR-", "DIFFMTH-", "DIFFMX-", "DIFFMY-", "DIFFMZ-"],
+"data" : {"value_type" : "DOUBLE" , "default" : 1.0 , "dimension":"1"}}
diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFC b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFC
index a7d0e8573..bac72a0e6 100644
--- a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFC
+++ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFC
@@ -1,7 +1,7 @@
 {"name" : "DIFFC" , "sections" : ["PROPS"], "size" : {"keyword" : "TABDIMS" , "item" : "NTPVT"},
  "items" : [
-                 {"name" : "OIL_MOL_WEIGHT" , "value_type" : "DOUBLE", "size_type": "ALL" },
-                 {"name" : "GAS_MOL_WEIGHT" , "value_type" : "DOUBLE", "size_type": "ALL" },
+                 {"name" : "OIL_MOL_WEIGHT" , "value_type" : "DOUBLE" },
+                 {"name" : "GAS_MOL_WEIGHT" , "value_type" : "DOUBLE" },
                  {"name" : "GAS_GAS_DIFF_COEFF" , "value_type" : "DOUBLE", "dimension": "Length*Length/Time"},
                  {"name" : "OIL_GAS_DIFF_COEFF" , "value_type" : "DOUBLE", "dimension": "Length*Length/Time"},
                  {"name" : "GAS_OIL_DIFF_COEFF" , "value_type" : "DOUBLE", "dimension": "Length*Length/Time"},
diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFCOAL b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFCOAL
new file mode 100644
index 000000000..06cddc986
--- /dev/null
+++ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFCOAL
@@ -0,0 +1,9 @@
+{"name" : "DIFFCOAL" , "sections" : ["PROPS"],  "size" : {"keyword" : "REGDIMS" , "item" : "NTCREG"},
+"items" : [
+    {"name" : "GAS_DIFF_COEFF" , "value_type" : "DOUBLE", "dimension": "Length*Length/Time"},
+    {"name" : "RE_ADSORB_FRACTION" , "value_type" : "DOUBLE", "dimension": "1", "default": 1.0},
+    {"name" : "SOL_DIFF_COEFF" , "value_type" : "DOUBLE", "dimension": "Length*Length/Time"}
+
+
+
+]}
diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFR b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFR
new file mode 100644
index 000000000..45b7e74d8
--- /dev/null
+++ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFR
@@ -0,0 +1 @@
+{"name" : "DIFFR" , "sections" : ["EDIT"], "data" : {"value_type" : "DOUBLE" , "dimension":"Length"}}
diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFTHT b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFTHT
new file mode 100644
index 000000000..814ea480a
--- /dev/null
+++ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFTHT
@@ -0,0 +1 @@
+{"name" : "DIFFTHT" , "sections" : ["EDIT"], "data" : {"value_type" : "DOUBLE" , "dimension":"Length"}}
diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFUSE b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFUSE
new file mode 100644
index 000000000..6893eb36a
--- /dev/null
+++ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFUSE
@@ -0,0 +1 @@
+{"name" : "DIFFUSE", "sections" : ["RUNSPEC"]}
diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFX b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFX
new file mode 100644
index 000000000..453538a3d
--- /dev/null
+++ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFX
@@ -0,0 +1 @@
+{"name" : "DIFFX" , "sections" : ["EDIT"], "data" : {"value_type" : "DOUBLE" , "dimension":"Length"}}
diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFY b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFY
new file mode 100644
index 000000000..dc60332b9
--- /dev/null
+++ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFY
@@ -0,0 +1 @@
+{"name" : "DIFFY" , "sections" : ["EDIT"], "data" : {"value_type" : "DOUBLE" , "dimension":"Length"}}
diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFZ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFZ
new file mode 100644
index 000000000..a94d5c491
--- /dev/null
+++ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIFFZ
@@ -0,0 +1 @@
+{"name" : "DIFFZ" , "sections" : ["EDIT"], "data" : {"value_type" : "DOUBLE" , "dimension":"Length"}}
diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIMPES b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIMPES
new file mode 100644
index 000000000..0ebac756e
--- /dev/null
+++ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIMPES
@@ -0,0 +1,9 @@
+{"name" : "DIMPES" , "sections" : ["SCHEDULE"] , "size" : 1,
+"items" : 
+   [
+        {"name" : "DSTARG" , "value_type" : "DOUBLE", "dimension": "1", "default": 0.05},
+        {"name" : "DSMAX" , "value_type" : "DOUBLE", "dimension": "1", "default": 0.1},
+        {"name" : "DPMAX" , "value_type" : "DOUBLE", "dimension": "Pressure", "default": 13.79}
+   ]
+}
+  
diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIMPLICT b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIMPLICT
new file mode 100644
index 000000000..3a68aa503
--- /dev/null
+++ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DIMPLICT
@@ -0,0 +1 @@
+{"name" : "DIMPLICT", "sections" : ["SCHEDULE"]}
diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DISPDIMS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DISPDIMS
new file mode 100644
index 000000000..9384a2cb1
--- /dev/null
+++ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DISPDIMS
@@ -0,0 +1,11 @@
+{"name" : "DISPDIMS" , "sections" : ["RUNSPEC"] , "size" : 1,
+"items" : 
+   [
+        {"name" : "NUM_DISP_TABLES" , "value_type" : "INT", "default": 1},
+        {"name" : "MAX_VELOCITY_NODES" , "value_type" : "INT", "default": 2},
+        {"name" : "MAX_CONCENTRATION_NODES" , "value_type" : "INT", "default": 1}
+
+
+   ]
+}
+  
diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DISPERSE b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DISPERSE
new file mode 100644
index 000000000..49aa9be28
--- /dev/null
+++ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DISPERSE
@@ -0,0 +1,6 @@
+{"name" : "DISPERSE" , "sections" : ["PROPS"], "num_tables" : {"keyword" : "DISPDIMS" , "item" : "MXDIST"},
+        "items" : [
+            {"name":"VELOCITY", "value_type" : "DOUBLE", "dimension":"Length/Time" },
+            {"name":"DATA", "value_type":"DOUBLE", "size_type" : "ALL" , "dimension" : ["1","Length*Length/Time"]}
+         ]
+}
diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DOMAINS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DOMAINS
new file mode 100644
index 000000000..578da287b
--- /dev/null
+++ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DOMAINS
@@ -0,0 +1 @@
+{"name" : "DOMAINS" , "sections" : ["GRID"], "data" : {"value_type" : "DOUBLE" , "dimension":"1"}}
diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DPGRID b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DPGRID
new file mode 100644
index 000000000..89a999c82
--- /dev/null
+++ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DPGRID
@@ -0,0 +1 @@
+{"name" : "DPGRID", "sections" : ["GRID"]}
diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DPKRMOD b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DPKRMOD
new file mode 100644
index 000000000..7b176bb0b
--- /dev/null
+++ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DPKRMOD
@@ -0,0 +1,11 @@
+{"name" : "DPKRMOD" , "sections" : ["PROPS"] , "size" : {"keyword" : "TABDIMS" , "item" : "NTSFUN"},
+"items" : 
+   [
+        {"name" : "MOD_OIL_WAT_PERM" , "value_type" : "DOUBLE", "dimension": "1", "default": 0.0},
+        {"name" : "MOD_OIL_GAS_PERM" , "value_type" : "DOUBLE", "dimension": "1", "default": 0.0},
+        {"name" : "SCALE_PERM_FRACTURE" , "value_type" : "STRING", "default": "YES"}
+
+
+   ]
+}
+  
diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DPNUM b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DPNUM
new file mode 100644
index 000000000..50eddb8fb
--- /dev/null
+++ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DPNUM
@@ -0,0 +1,9 @@
+{"name" : "DPNUM" , "sections" : ["GRID"] , "size" : 1,
+"items" : 
+   [
+        {"name" : "VALUE" , "value_type" : "INT", "size_type" : "ALL"}
+
+
+   ]
+}
+  
diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DRILPRI b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DRILPRI
new file mode 100644
index 000000000..38881b391
--- /dev/null
+++ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DRILPRI
@@ -0,0 +1,18 @@
+{"name" : "DRILPRI" , "sections" : ["SCHEDULE"] , "size" : 1,
+"items" : 
+   [
+        {"name" : "INTERVAL" , "value_type" : "DOUBLE", "dimension":"Time", "default":0},
+        {"name" : "A" , "value_type" : "DOUBLE", "default":0},
+        {"name" : "B" , "value_type" : "DOUBLE", "default":0},
+        {"name" : "C" , "value_type" : "DOUBLE", "default":0},
+        {"name" : "D" , "value_type" : "DOUBLE", "default":0},
+        {"name" : "E" , "value_type" : "DOUBLE", "default":0},
+        {"name" : "F" , "value_type" : "DOUBLE", "default":0},
+        {"name" : "G" , "value_type" : "DOUBLE", "default":0},
+        {"name" : "H" , "value_type" : "DOUBLE", "default":0},
+        {"name" : "LOOK_AHEAD" , "value_type" : "DOUBLE", "dimension":"Time", "default":0},
+        {"name" : "CALCULATION" , "value_type" : "STRING", "default":"SINGLE"}
+
+   ]
+}
+  
diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DSPDEINT b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DSPDEINT
new file mode 100644
index 000000000..b66060995
--- /dev/null
+++ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DSPDEINT
@@ -0,0 +1 @@
+{"name" : "DSPDEINT", "sections" : ["PROPS"]}
diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DUALPERM b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DUALPERM
new file mode 100644
index 000000000..1f7354275
--- /dev/null
+++ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DUALPERM
@@ -0,0 +1 @@
+{"name" : "DUALPERM", "sections" : ["RUNSPEC"]}
diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DUALPORO b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DUALPORO
new file mode 100644
index 000000000..5d35f28de
--- /dev/null
+++ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DUALPORO
@@ -0,0 +1 @@
+{"name" : "DUALPORO", "sections" : ["RUNSPEC"]}
diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DUMPCUPL b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DUMPCUPL
new file mode 100644
index 000000000..a722cbc7d
--- /dev/null
+++ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DUMPCUPL
@@ -0,0 +1,9 @@
+{"name" : "DUMPCUPL" , "sections" : ["SCHEDULE"] , "size" : 1,
+"items" : 
+   [
+        {"name" : "VALUE" , "value_type" : "STRING"}
+
+
+   ]
+}
+  
diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DYNRDIMS b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DYNRDIMS
new file mode 100644
index 000000000..5b4613baf
--- /dev/null
+++ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DYNRDIMS
@@ -0,0 +1,11 @@
+{"name" : "DYNRDIMS" , "sections" : ["RUNSPEC"] , "size" : 1,
+"items" : 
+   [
+        {"name" : "MNUMDR" , "value_type" : "INT", "default": 0},
+        {"name" : "MXDYNF" , "value_type" : "INT", "default": 0},
+        {"name" : "MXDYNR" , "value_type" : "INT", "default": 0}
+
+
+   ]
+}
+  
diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DZMATRIX b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DZMATRIX
new file mode 100644
index 000000000..a4e06dcad
--- /dev/null
+++ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DZMATRIX
@@ -0,0 +1 @@
+{"name" : "DZMATRIX" , "sections" : ["GRID"], "data" : {"value_type" : "DOUBLE" , "default" : 0 , "dimension":"Length"}}
diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DZMTRX b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DZMTRX
new file mode 100644
index 000000000..50482b37d
--- /dev/null
+++ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DZMTRX
@@ -0,0 +1 @@
+{"name" : "DZMTRX" , "sections" : ["GRID"], "data" : {"value_type" : "DOUBLE" , "default" : 0 , "dimension":"Length"}}
diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DZMTRXV b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DZMTRXV
new file mode 100644
index 000000000..69fb97463
--- /dev/null
+++ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/D/DZMTRXV
@@ -0,0 +1 @@
+{"name" : "DZMTRXV" , "sections" : ["GRID"], "data" : {"value_type" : "DOUBLE" , "default" : 0 , "dimension":"Length"}}
diff --git a/src/opm/parser/eclipse/share/keywords/keyword_list.cmake b/src/opm/parser/eclipse/share/keywords/keyword_list.cmake
index d9b5a6f11..1a3ba0714 100644
--- a/src/opm/parser/eclipse/share/keywords/keyword_list.cmake
+++ b/src/opm/parser/eclipse/share/keywords/keyword_list.cmake
@@ -9,6 +9,12 @@
 # you are therefore encouraged to go to the opm-simulators repository and update
 # the file: opm/autodiff/MissingFeatures.cpp
 
+#Some keywords are found to be of 'special' structure:
+#W             WHAT
+#ECONT         Terminates with two /
+#COALNUM       matrix structure
+#DYNAMICR      records of records
+
 
 set( keywords
      000_Eclipse100/A/ACTDIMS
@@ -75,16 +81,21 @@ set( keywords
      000_Eclipse100/C/COLLAPSE
      000_Eclipse100/C/COLUMNS
      000_Eclipse100/C/COMPDAT
-     000_Eclipse100/C/COMPDATL
+     000_Eclipse100/C/COMPDATX
      000_Eclipse100/C/COMPFLSH
      000_Eclipse100/C/COMPIMB
+     000_Eclipse100/C/COMPINJK
      000_Eclipse100/C/COMPLMPL
      000_Eclipse100/C/COMPLUMP
      000_Eclipse100/C/COMPOFF
      000_Eclipse100/C/COMPORD
      000_Eclipse100/C/COMPRIV
+     000_Eclipse100/C/COMPRP
+     000_Eclipse100/C/COMPRPL
      000_Eclipse100/C/COMPSEGL
      000_Eclipse100/C/COMPSEGS
+     000_Eclipse100/C/COMPVE
+     000_Eclipse100/C/COMPVEL
      000_Eclipse100/C/CONNECTION_PROBE
      000_Eclipse100/C/COORD
      000_Eclipse100/C/COORDSYS
@@ -93,6 +104,7 @@ set( keywords
      000_Eclipse100/C/COPYREG
      000_Eclipse100/C/CPR
      000_Eclipse100/C/CRITPERM
+     000_Eclipse100/C/CSKIN
      000_Eclipse100/D/DATE
      000_Eclipse100/D/DATES
      000_Eclipse100/D/DATUM
@@ -103,9 +115,12 @@ set( keywords
      000_Eclipse100/D/DELAYACT
      000_Eclipse100/D/DENSITY
      000_Eclipse100/D/DEPTH
+     000_Eclipse100/D/DEPTHTAB
      000_Eclipse100/D/DEPTHZ
      000_Eclipse100/D/DIAGDISP
+     000_Eclipse100/D/DIFF
      000_Eclipse100/D/DIFFC
+     000_Eclipse100/D/DIFFCOAL
      000_Eclipse100/D/DIFFDP
      000_Eclipse100/D/DIFFMMF
      000_Eclipse100/D/DIFFMR
@@ -113,22 +128,45 @@ set( keywords
      000_Eclipse100/D/DIFFMX
      000_Eclipse100/D/DIFFMY
      000_Eclipse100/D/DIFFMZ
+     000_Eclipse100/D/DIFFR
+     000_Eclipse100/D/DIFFTHT
+     000_Eclipse100/D/DIFFUSE
+     000_Eclipse100/D/DIFFX
+     000_Eclipse100/D/DIFFY
+     000_Eclipse100/D/DIFFZ
      000_Eclipse100/D/DIMENS
+     000_Eclipse100/D/DIMPES
+     000_Eclipse100/D/DIMPLICT
      000_Eclipse100/D/DISGAS
+     000_Eclipse100/D/DISPDIMS
+     000_Eclipse100/D/DISPERSE
+     000_Eclipse100/D/DOMAINS
+     000_Eclipse100/D/DPGRID
+     000_Eclipse100/D/DPKRMOD
+     000_Eclipse100/D/DPNUM
      000_Eclipse100/D/DR
+     000_Eclipse100/D/DRILPRI
      000_Eclipse100/D/DRSDT
      000_Eclipse100/D/DRSDTR
      000_Eclipse100/D/DRV
      000_Eclipse100/D/DRVDT
      000_Eclipse100/D/DRVDTR
+     000_Eclipse100/D/DSPDEINT
      000_Eclipse100/D/DTHETA
      000_Eclipse100/D/DTHETAV
+     000_Eclipse100/D/DUALPERM
+     000_Eclipse100/D/DUALPORO
      000_Eclipse100/D/DUMPFLUX
+     000_Eclipse100/D/DUMPCUPL
+     000_Eclipse100/D/DYNRDIMS
      000_Eclipse100/D/DX
      000_Eclipse100/D/DXV
      000_Eclipse100/D/DY
      000_Eclipse100/D/DYV
      000_Eclipse100/D/DZ
+     000_Eclipse100/D/DZMATRIX
+     000_Eclipse100/D/DZMTRX
+     000_Eclipse100/D/DZMTRXV
      000_Eclipse100/E/ECHO
      000_Eclipse100/E/EDIT
      000_Eclipse100/E/EDITNNC