diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake
index e952d5baa..fd86cef75 100644
--- a/CMakeLists_files.cmake
+++ b/CMakeLists_files.cmake
@@ -214,13 +214,13 @@ list (APPEND PUBLIC_HEADER_FILES
              opm/models/parallel/gridcommhandles.hh
              opm/models/parallel/mpibuffer.hh
              opm/models/parallel/threadedentityiterator.hh
-             opm/models/ptflash/flashintensivequantities.hh
              opm/models/ptflash/flashindices.hh
+             opm/models/ptflash/flashintensivequantities.hh
              opm/models/ptflash/flashlocalresidual.hh
              opm/models/ptflash/flashmodel.hh
              opm/models/ptflash/flashnewtonmethod.hh
-             opm/models/ptflash/flashparameters.hh
              opm/models/ptflash/flashprimaryvariables.hh
+             opm/models/ptflash/flashproperties.hh
              opm/models/pvs/pvsboundaryratevector.hh
              opm/models/pvs/pvsratevector.hh
              opm/models/pvs/pvsindices.hh
diff --git a/opm/models/ptflash/flashindices.hh b/opm/models/ptflash/flashindices.hh
index 6fc33bcbc..dfd1369af 100644
--- a/opm/models/ptflash/flashindices.hh
+++ b/opm/models/ptflash/flashindices.hh
@@ -40,6 +40,7 @@ namespace Opm {
  *
  * \tparam PVOffset The first index in a primary variable vector.
  */
+ // TODO: The indices class should handle whether phase is active, not the FluidSystem
 template <class TypeTag, int PVOffset>
 class FlashIndices
     : public EnergyIndices<PVOffset + getPropValue<TypeTag, Properties::NumComponents>(),
@@ -50,6 +51,15 @@ class FlashIndices
     using EnergyIndices = Opm::EnergyIndices<PVOffset + numComponents, enableEnergy>;
 
 public:
+    static constexpr bool waterEnabled = false;
+    static constexpr bool gasEnabled = true;
+    static constexpr bool oilEnabled = true;
+    static constexpr int waterPhaseIdx = -1;
+    // static constexpr int waterGasIdx = 0;
+    // static constexpr int waterOilIdx = 1;
+    static constexpr int compositionSwitchIdx = -1;
+    static constexpr int numPhases = 2;
+    unsigned canonicalToActiveComponentIndex(unsigned solventCompIdx){return solventCompIdx;};
     //! number of equations/primary variables
     static const int numEq = numComponents + EnergyIndices::numEq_;
 
@@ -60,7 +70,7 @@ public:
 
     //! Index of the molefraction of the first component
     static constexpr int z0Idx = pressure0Idx + 1;
-    
+
     // equation indices
 
     //! Index of the mass conservation equation for the first