diff --git a/opm/core/ProductionSpecification.cpp b/opm/core/ProductionSpecification.cpp
index 63c50040..eb0f7d83 100644
--- a/opm/core/ProductionSpecification.cpp
+++ b/opm/core/ProductionSpecification.cpp
@@ -5,13 +5,15 @@ namespace Opm
 
     ProductionSpecification::ProductionSpecification()
     : 
-      control_mode_(NONE_CM),
+      control_mode_(NONE),
       procedure_(NONE_P),
-      oil_max_rate_(1e100),
-      water_production_target_(1e100),
-      fluid_volume_max_rate_(1e100),
-      BHP_limit_(1e100),
-      guide_rate_(1),
+      oil_max_rate_(-1e100),
+      water_max_rate_(-1e100),
+      gas_max_rate_(-1e100),
+      liquid_max_rate_(-1e100),
+      reservoir_flow_max_rate_(-1e100),
+      BHP_limit_(-1e100),
+      guide_rate_(1.0),
       guide_rate_type_(NONE_GRT)      
     {
     }
diff --git a/opm/core/ProductionSpecification.hpp b/opm/core/ProductionSpecification.hpp
index 21397c8d..ff5ace8c 100644
--- a/opm/core/ProductionSpecification.hpp
+++ b/opm/core/ProductionSpecification.hpp
@@ -11,7 +11,7 @@ namespace Opm
 
         enum ControlMode
         {
-            NONE_CM, ORAT, WRAT, LRAT, REIN, RESV, VREP, WGRA, FLD, GRUP, BHP
+            NONE, ORAT, WRAT, GRAT, LRAT, CRAT, RESV, PRBL, BHP, THP, GRUP, FLD
         };
 
         enum Procedure
@@ -21,7 +21,7 @@ namespace Opm
         
         enum GuideRateType
         {
-            OIL, RAT, NONE_GRT
+            OIL, NONE_GRT
         };
 
         ProductionSpecification();
@@ -30,11 +30,11 @@ namespace Opm
         Procedure procedure_;
 
         double oil_max_rate_;
-        double water_production_target_;
-        double fluid_volume_max_rate_;
-        double BHP_limit_;
+        double water_max_rate_;
         double gas_max_rate_;
         double liquid_max_rate_;
+        double reservoir_flow_max_rate_;
+        double BHP_limit_;
         double guide_rate_;
         GuideRateType guide_rate_type_;