diff --git a/src/main/java/neqsim/processSimulation/processEquipment/util/NeqSimUnit.java b/src/main/java/neqsim/processSimulation/processEquipment/util/NeqSimUnit.java
index b0b2804008..8a7bf3fc12 100644
--- a/src/main/java/neqsim/processSimulation/processEquipment/util/NeqSimUnit.java
+++ b/src/main/java/neqsim/processSimulation/processEquipment/util/NeqSimUnit.java
@@ -5,7 +5,7 @@
 import neqsim.fluidMechanics.flowNode.twoPhaseNode.twoPhasePipeFlowNode.DropletFlowNode;
 import neqsim.fluidMechanics.flowNode.twoPhaseNode.twoPhasePipeFlowNode.StratifiedFlowNode;
 import neqsim.fluidMechanics.geometryDefinitions.pipe.PipeData;
-import neqsim.processSimulation.processEquipment.ProcessEquipmentBaseClass;
+import neqsim.processSimulation.processEquipment.TwoPortEquipment;
 import neqsim.processSimulation.processEquipment.stream.Stream;
 import neqsim.processSimulation.processEquipment.stream.StreamInterface;
 import neqsim.thermo.system.SystemInterface;
@@ -18,11 +18,9 @@
  * @author esol
  * @version $Id: $Id
  */
-public class NeqSimUnit extends ProcessEquipmentBaseClass {
+public class NeqSimUnit extends TwoPortEquipment {
     private static final long serialVersionUID = 1000;
 
-    StreamInterface inletStream;
-    StreamInterface outStream;
     SystemInterface thermoSystem;
     private String equipment = "pipeline";
     String flowPattern = "stratified";
@@ -56,27 +54,16 @@ public NeqSimUnit(StreamInterface inletStream, String equipment, String flowPatt
      * @param inletStream a {@link neqsim.processSimulation.processEquipment.stream.Stream} object
      */
     public void setInletStream(StreamInterface inletStream) {
-        this.inletStream = inletStream;
+        this.inStream = inletStream;
 
         thermoSystem = inletStream.getThermoSystem().clone();
         outStream = new Stream("outStream", thermoSystem);
     }
 
-    /**
-     * <p>
-     * Getter for the field <code>outStream</code>.
-     * </p>
-     *
-     * @return a {@link neqsim.processSimulation.processEquipment.stream.Stream} object
-     */
-    public StreamInterface getOutStream() {
-        return outStream;
-    }
-
     /** {@inheritDoc} */
     @Override
     public void run() {
-        thermoSystem = inletStream.getThermoSystem().clone();
+        thermoSystem = inStream.getThermoSystem().clone();
         if (equipment.equals("pipeline") && flowPattern.equals("stratified")) {
             runStratified();
         } else if (equipment.equals("pipeline") && flowPattern.equals("annular")) {
diff --git a/src/main/java/neqsim/processSimulation/processEquipment/util/Recycle.java b/src/main/java/neqsim/processSimulation/processEquipment/util/Recycle.java
index 58ccd2571c..36396f2915 100644
--- a/src/main/java/neqsim/processSimulation/processEquipment/util/Recycle.java
+++ b/src/main/java/neqsim/processSimulation/processEquipment/util/Recycle.java
@@ -193,7 +193,7 @@ public double calcMixStreamEnthalpy() {
     }
 
     /** {@inheritDoc} */
-    @Override
+    @Deprecated
     public StreamInterface getOutStream() {
         return mixedStream;
     }