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/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/keyword_list.cmake b/src/opm/parser/eclipse/share/keywords/keyword_list.cmake
index 13af28e58..10b25039f 100644
--- a/src/opm/parser/eclipse/share/keywords/keyword_list.cmake
+++ b/src/opm/parser/eclipse/share/keywords/keyword_list.cmake
@@ -13,19 +13,6 @@
 #W             WHAT
 #ECONT         Terminates with two /
 #COALNUM       matrix structure
-#COMPDATM      alias for COMPDATL
-#COMPINJK      undef default
-#COMPRP        strange defaults
-#COMPRPL       strange defaults
-#COMPVE        default: negative
-#COMPVEL       default: negative
-#CSKIN         strange default
-#DEPTHTAB      different unit in table
-#DIFFCOAL      default for item3 same as value for item 1
-#DIFFMR-       no support for character '-' in kw. 
-#DIFFMTH-      no support for character '-' in kw. 
-#DIFFMX-       no support for character '-' in kw. 
-#DIFFMY-       no support for character '-' in kw. 
 #DYNAMICR      records of records
 
 
@@ -94,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
@@ -112,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
@@ -122,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