diff --git a/docs/uml/main/InputDatamodelConcept.puml b/docs/uml/main/InputDatamodelConcept.puml
index 5044f62bd..79af3962e 100644
--- a/docs/uml/main/InputDatamodelConcept.puml
+++ b/docs/uml/main/InputDatamodelConcept.puml
@@ -36,11 +36,20 @@ abstract Class ConnectorInput {
 }
 ConnectorInput --|> AssetInput
 
-abstract Class AssetCharacteristicsInput {
-+ type: String
+abstract Class AssetCharacteristicsInput<T extends AssetTypeInput> {
+    - type: T
+    - characteristic: String
 }
 AssetCharacteristicsInput --|> InputEntity
 
+Class WecCharacteristicInput {
+}
+WecCharacteristicInput --|> AssetCharacteristicsInput: <<bind>>T::WecTypeInput
+
+Class EvCharacteristicInput {
+}
+EvCharacteristicInput --|> AssetCharacteristicsInput: <<bind>>T::EvTypeInput
+
 abstract Class AssetTypeInput {
 + id: String
 }
@@ -161,18 +170,6 @@ Class Transformer3WTypeInput {
 }
 Transformer3WTypeInput --|> AssetTypeInput
 
-
-Class WecCharacteristicInput {
-+ cpCharacteristic: String
-}
-WecCharacteristicInput --|> AssetCharacteristicsInput
-
-Class EvCharacteristicInput {
- ???
-}
-EvCharacteristicInput --|> AssetCharacteristicsInput
-
-
 Class RandomLoadParameter {
 + quarterHour: Integer
 + kWd: Double
diff --git a/docs/uml/test/TestDataHierarchy.puml b/docs/uml/test/TestDataHierarchy.puml
index 83831602a..a009dc660 100644
--- a/docs/uml/test/TestDataHierarchy.puml
+++ b/docs/uml/test/TestDataHierarchy.puml
@@ -2,7 +2,9 @@
 Interface GridTestData
 Interface ComplexTopology
 Interface SystemParticipantTestData
+Interface TypeTestData
 
 GridTestData <|-- ComplexTopology
 GridTestData <|-- SystemParticipantTestData
+GridTestData <|-- TypeTestData
 @enduml
\ No newline at end of file
diff --git a/src/main/java/edu/ie3/datamodel/io/factory/input/NodeInputFactory.java b/src/main/java/edu/ie3/datamodel/io/factory/input/NodeInputFactory.java
index eabe92493..6bdedd494 100644
--- a/src/main/java/edu/ie3/datamodel/io/factory/input/NodeInputFactory.java
+++ b/src/main/java/edu/ie3/datamodel/io/factory/input/NodeInputFactory.java
@@ -17,10 +17,10 @@
 
 public class NodeInputFactory extends AssetInputEntityFactory<NodeInput, AssetInputEntityData> {
   private static final String V_TARGET = "vtarget";
-  public static final String V_RATED = "vrated";
+  public static final String V_RATED = "vRated";
   private static final String SLACK = "slack";
   private static final String GEO_POSITION = "geoposition";
-  public static final String VOLT_LVL = "voltlvl";
+  public static final String VOLT_LVL = "voltLvl";
   private static final String SUBNET = "subnet";
 
   public NodeInputFactory() {
@@ -29,7 +29,9 @@ public NodeInputFactory() {
 
   @Override
   protected String[] getAdditionalFields() {
-    return new String[] {V_TARGET, V_RATED, SLACK, GEO_POSITION, VOLT_LVL, SUBNET};
+    return new String[] {
+      V_TARGET, V_RATED.toLowerCase(), SLACK, GEO_POSITION, VOLT_LVL.toLowerCase(), SUBNET
+    };
   }
 
   @Override
@@ -43,7 +45,7 @@ protected NodeInput buildModel(
         data.getQuantity(V_TARGET, StandardUnits.TARGET_VOLTAGE_MAGNITUDE);
     final boolean slack = data.getBoolean(SLACK);
     final Point geoPosition = data.getPoint(GEO_POSITION).orElse(null);
-    final VoltageLevel voltLvl = data.getVoltageLvl(VOLT_LVL, V_RATED);
+    final VoltageLevel voltLvl = data.getVoltageLvl(VOLT_LVL.toLowerCase(), V_RATED.toLowerCase());
     final int subnet = data.getInt(SUBNET);
     return new NodeInput(
         uuid, operationTime, operatorInput, id, vTarget, slack, geoPosition, voltLvl, subnet);
diff --git a/src/main/java/edu/ie3/datamodel/io/factory/typeinput/SystemParticipantTypeInputFactory.java b/src/main/java/edu/ie3/datamodel/io/factory/typeinput/SystemParticipantTypeInputFactory.java
index 148837c65..ab1f04fd2 100644
--- a/src/main/java/edu/ie3/datamodel/io/factory/typeinput/SystemParticipantTypeInputFactory.java
+++ b/src/main/java/edu/ie3/datamodel/io/factory/typeinput/SystemParticipantTypeInputFactory.java
@@ -37,7 +37,7 @@ public class SystemParticipantTypeInputFactory
   private static final String E_CONS = "econs";
 
   // BmTypeInput
-  private static final String LOAD_GRADIENT = "loadgradient";
+  private static final String ACTIVE_POWER_GRADIENT = "activepowergradient";
 
   // WecTypeInput
   private static final String ROTOR_AREA = "rotorarea";
@@ -50,7 +50,6 @@ public class SystemParticipantTypeInputFactory
 
   // StorageTypeInput
   private static final String P_MAX = "pmax";
-  private static final String CP_RATE = "cprate";
   private static final String ETA = "eta";
   private static final String DOD = "dod";
   private static final String LIFETIME = "lifetime";
@@ -77,7 +76,7 @@ protected List<Set<String>> getFields(SimpleEntityData data) {
     } else if (data.getEntityClass().equals(HpTypeInput.class)) {
       constructorParameters = expandSet(standardConstructorParams, P_THERMAL);
     } else if (data.getEntityClass().equals(BmTypeInput.class)) {
-      constructorParameters = expandSet(standardConstructorParams, LOAD_GRADIENT, ETA_CONV);
+      constructorParameters = expandSet(standardConstructorParams, ACTIVE_POWER_GRADIENT, ETA_CONV);
     } else if (data.getEntityClass().equals(WecTypeInput.class)) {
       constructorParameters =
           expandSet(standardConstructorParams, ETA_CONV, ROTOR_AREA, HUB_HEIGHT);
@@ -87,7 +86,14 @@ protected List<Set<String>> getFields(SimpleEntityData data) {
     } else if (data.getEntityClass().equals(StorageTypeInput.class)) {
       constructorParameters =
           expandSet(
-              standardConstructorParams, E_STORAGE, P_MAX, CP_RATE, ETA, DOD, LIFETIME, LIFECYCLE);
+              standardConstructorParams,
+              E_STORAGE,
+              P_MAX,
+              ACTIVE_POWER_GRADIENT,
+              ETA,
+              DOD,
+              LIFETIME,
+              LIFECYCLE);
     }
 
     return Collections.singletonList(constructorParameters);
@@ -156,7 +162,7 @@ private SystemParticipantTypeInput buildBmTypeInput(
       Quantity<Power> sRated,
       double cosPhi) {
     Quantity<DimensionlessRate> loadGradient =
-        data.getQuantity(LOAD_GRADIENT, StandardUnits.LOAD_GRADIENT);
+        data.getQuantity(ACTIVE_POWER_GRADIENT, StandardUnits.ACTIVE_POWER_GRADIENT);
     Quantity<Dimensionless> etaConv = data.getQuantity(ETA_CONV, StandardUnits.EFFICIENCY);
 
     return new BmTypeInput(uuid, id, capEx, opEx, loadGradient, sRated, cosPhi, etaConv);
@@ -204,14 +210,26 @@ private SystemParticipantTypeInput buildStorageTypeInput(
       double cosPhi) {
     Quantity<Energy> eStorage = data.getQuantity(E_STORAGE, StandardUnits.ENERGY_IN);
     Quantity<Power> pMax = data.getQuantity(P_MAX, StandardUnits.ACTIVE_POWER_IN);
-    Quantity<DimensionlessRate> cprate = data.getQuantity(CP_RATE, StandardUnits.CP_RATE);
+    Quantity<DimensionlessRate> activePowerGradient =
+        data.getQuantity(ACTIVE_POWER_GRADIENT, StandardUnits.ACTIVE_POWER_GRADIENT);
     Quantity<Dimensionless> eta = data.getQuantity(ETA, StandardUnits.EFFICIENCY);
     Quantity<Dimensionless> dod = data.getQuantity(DOD, StandardUnits.DOD);
     Quantity<Time> lifeTime = data.getQuantity(LIFETIME, StandardUnits.LIFE_TIME);
     int lifeCycle = data.getInt(LIFECYCLE);
 
     return new StorageTypeInput(
-        uuid, id, capEx, opEx, eStorage, sRated, cosPhi, pMax, cprate, eta, dod, lifeTime,
+        uuid,
+        id,
+        capEx,
+        opEx,
+        eStorage,
+        sRated,
+        cosPhi,
+        pMax,
+        activePowerGradient,
+        eta,
+        dod,
+        lifeTime,
         lifeCycle);
   }
 }
diff --git a/src/main/java/edu/ie3/datamodel/io/processor/EntityProcessor.java b/src/main/java/edu/ie3/datamodel/io/processor/EntityProcessor.java
index 5e0b0524e..163d13a89 100644
--- a/src/main/java/edu/ie3/datamodel/io/processor/EntityProcessor.java
+++ b/src/main/java/edu/ie3/datamodel/io/processor/EntityProcessor.java
@@ -15,7 +15,6 @@
 import edu.ie3.datamodel.models.input.system.StorageStrategy;
 import edu.ie3.datamodel.models.voltagelevels.VoltageLevel;
 import edu.ie3.util.TimeTools;
-import edu.ie3.util.quantities.interfaces.EnergyPrice;
 import java.beans.Introspector;
 import java.lang.reflect.Method;
 import java.time.ZoneId;
@@ -23,7 +22,6 @@
 import java.util.*;
 import java.util.stream.Collectors;
 import javax.measure.Quantity;
-import javax.measure.quantity.*;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -53,6 +51,14 @@ public abstract class EntityProcessor<T extends UniqueEntity> {
   private static final String VOLT_LVL = NodeInputFactory.VOLT_LVL;
   private static final String V_RATED = NodeInputFactory.V_RATED;
 
+  /* Quantities associated to those fields must be treated differently (e.g. input and result), all other quantity /
+   * field combinations can be treated on a common basis and therefore need no further distinction */
+  private static final Set<String> specificQuantityFieldNames =
+      Collections.unmodifiableSet(
+          new HashSet<>(
+              Arrays.asList(
+                  "eConsAnnual", "energy", "eStorage", "q", "p", "pMax", "pOwn", "pThermal")));
+
   private static final GeoJsonWriter geoJsonWriter = new GeoJsonWriter();
 
   /** Field name of {@link UniqueEntity} uuid */
@@ -181,6 +187,14 @@ private Optional<LinkedHashMap<String, String>> processEntity(T entity) {
     return resultMapOpt;
   }
 
+  /**
+   * Processes the returned object to String by taking care of different conventions.
+   *
+   * @param methodReturnObject Return object to process
+   * @param method The method, that is invoked
+   * @param fieldName Name of the foreseen field
+   * @return A String representation of the result
+   */
   private String processMethodResult(Object methodReturnObject, Method method, String fieldName) {
 
     StringBuilder resultStringBuilder = new StringBuilder();
@@ -228,6 +242,7 @@ private String processMethodResult(Object methodReturnObject, Method method, Str
         resultStringBuilder.append(((StorageStrategy) methodReturnObject).getToken());
         break;
       case "NodeInput":
+      case "AssetTypeInput":
       case "Transformer3WTypeInput":
       case "Transformer2WTypeInput":
       case "LineTypeInput":
@@ -323,8 +338,6 @@ protected String processVoltageLevel(VoltageLevel voltageLevel, String fieldName
                               + "' in result entity "
                               + getRegisteredClass().getSimpleName()
                               + ".class.")));
-    ;
-
     return resultStringBuilder.toString();
   }
 
@@ -337,68 +350,11 @@ protected String processVoltageLevel(VoltageLevel voltageLevel, String fieldName
    *     or empty if an error occurred during processing
    */
   protected Optional<String> handleQuantity(Quantity<?> quantity, String fieldName) {
-
-    Optional<String> normalizedQuantityValue = Optional.empty();
-
-    switch (fieldName) {
-      case "p":
-      case "q":
-      case "energy":
-      case "vTarget":
-      case "vrated":
-      case "sRated":
-      case "eConsAnnual":
-        normalizedQuantityValue = handleProcessorSpecificQuantity(quantity, fieldName);
-        break;
-      case "soc":
-      case "vAng":
-      case "vMag":
-      case "iAAng":
-      case "iBAng":
-      case "iCAng":
-      case "etaConv":
-      case "azimuth":
-      case "height":
-        normalizedQuantityValue = quantityValToOptionalString(quantity);
-        break;
-      case "iAMag":
-      case "iBMag":
-      case "iCMag":
-        normalizedQuantityValue =
-            quantityValToOptionalString(
-                quantity
-                    .asType(ElectricCurrent.class)
-                    .to(StandardUnits.ELECTRIC_CURRENT_MAGNITUDE));
-        break;
-      case "qDot":
-        normalizedQuantityValue =
-            quantityValToOptionalString(
-                quantity.asType(Power.class).to(StandardUnits.Q_DOT_RESULT));
-        break;
-      case "fillLevel":
-        normalizedQuantityValue =
-            quantityValToOptionalString(
-                quantity.asType(Dimensionless.class).to(StandardUnits.FILL_LEVEL));
-        break;
-      case "length":
-        normalizedQuantityValue =
-            quantityValToOptionalString(
-                quantity.asType(Length.class).to(StandardUnits.LINE_LENGTH));
-        break;
-
-      case "feedInTariff":
-        normalizedQuantityValue =
-            quantityValToOptionalString(
-                quantity.asType(EnergyPrice.class).to(StandardUnits.ENERGY_PRICE));
-        break;
-      default:
-        log.error(
-            "Cannot process quantity with value '{}' for field with name {} in model processing!",
-            quantity,
-            fieldName);
-        break;
+    if (specificQuantityFieldNames.contains(fieldName)) {
+      return handleProcessorSpecificQuantity(quantity, fieldName);
+    } else {
+      return quantityValToOptionalString(quantity);
     }
-    return normalizedQuantityValue;
   }
 
   /**
diff --git a/src/main/java/edu/ie3/datamodel/io/processor/ProcessorProvider.java b/src/main/java/edu/ie3/datamodel/io/processor/ProcessorProvider.java
index de5d6e3df..2301f1c20 100644
--- a/src/main/java/edu/ie3/datamodel/io/processor/ProcessorProvider.java
+++ b/src/main/java/edu/ie3/datamodel/io/processor/ProcessorProvider.java
@@ -6,12 +6,10 @@
 package edu.ie3.datamodel.io.processor;
 
 import edu.ie3.datamodel.exceptions.ProcessorProviderException;
-import edu.ie3.datamodel.io.processor.input.AssetInputProcessor;
-import edu.ie3.datamodel.io.processor.input.GraphicInputProcessor;
+import edu.ie3.datamodel.io.processor.input.InputEntityProcessor;
 import edu.ie3.datamodel.io.processor.result.ResultEntityProcessor;
 import edu.ie3.datamodel.models.UniqueEntity;
-import edu.ie3.datamodel.models.input.AssetInput;
-import edu.ie3.datamodel.models.input.graphics.GraphicInput;
+import edu.ie3.datamodel.models.input.InputEntity;
 import edu.ie3.datamodel.models.result.ResultEntity;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -133,13 +131,8 @@ private Collection<EntityProcessor<? extends UniqueEntity>> allProcessors() {
 
     // todo add missing processors here
     // AssetInput
-    for (Class<? extends AssetInput> cls : AssetInputProcessor.eligibleEntityClasses) {
-      resultingProcessors.add(new AssetInputProcessor(cls));
-    }
-
-    // GraphicInput
-    for (Class<? extends GraphicInput> cls : GraphicInputProcessor.eligibleEntityClasses) {
-      resultingProcessors.add(new GraphicInputProcessor(cls));
+    for (Class<? extends InputEntity> cls : InputEntityProcessor.eligibleEntityClasses) {
+      resultingProcessors.add(new InputEntityProcessor(cls));
     }
 
     // SystemParticipantResults
diff --git a/src/main/java/edu/ie3/datamodel/io/processor/input/GraphicInputProcessor.java b/src/main/java/edu/ie3/datamodel/io/processor/input/GraphicInputProcessor.java
deleted file mode 100644
index bdb9cd8b9..000000000
--- a/src/main/java/edu/ie3/datamodel/io/processor/input/GraphicInputProcessor.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * © 2020. TU Dortmund University,
- * Institute of Energy Systems, Energy Efficiency and Energy Economics,
- * Research group Distribution grid planning and operation
-*/
-package edu.ie3.datamodel.io.processor.input;
-
-import edu.ie3.datamodel.io.processor.EntityProcessor;
-import edu.ie3.datamodel.models.input.graphics.GraphicInput;
-import edu.ie3.datamodel.models.input.graphics.LineGraphicInput;
-import edu.ie3.datamodel.models.input.graphics.NodeGraphicInput;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import javax.measure.Quantity;
-
-/**
- * Processor to deserialize all children of {@link GraphicInput} to a mapping from field name to
- * value (as string representation). All necessary processes are already apparent in the {@link
- * EntityProcessor}, therefore, no additional implementations have to be made.
- */
-public class GraphicInputProcessor extends EntityProcessor<GraphicInput> {
-  public static final List<Class<? extends GraphicInput>> eligibleEntityClasses =
-      Collections.unmodifiableList(Arrays.asList(NodeGraphicInput.class, LineGraphicInput.class));
-
-  public GraphicInputProcessor(Class<? extends GraphicInput> registeredClass) {
-    super(registeredClass);
-  }
-
-  @Override
-  protected Optional<String> handleProcessorSpecificQuantity(
-      Quantity<?> quantity, String fieldName) {
-    throw new UnsupportedOperationException(
-        "No specific quantity handling required for graphic input models.");
-  }
-
-  @Override
-  protected List<Class<? extends GraphicInput>> getAllEligibleClasses() {
-    return eligibleEntityClasses;
-  }
-}
diff --git a/src/main/java/edu/ie3/datamodel/io/processor/input/AssetInputProcessor.java b/src/main/java/edu/ie3/datamodel/io/processor/input/InputEntityProcessor.java
similarity index 51%
rename from src/main/java/edu/ie3/datamodel/io/processor/input/AssetInputProcessor.java
rename to src/main/java/edu/ie3/datamodel/io/processor/input/InputEntityProcessor.java
index c76b46fcd..f7bd96ce5 100644
--- a/src/main/java/edu/ie3/datamodel/io/processor/input/AssetInputProcessor.java
+++ b/src/main/java/edu/ie3/datamodel/io/processor/input/InputEntityProcessor.java
@@ -9,51 +9,79 @@
 import edu.ie3.datamodel.models.StandardUnits;
 import edu.ie3.datamodel.models.input.*;
 import edu.ie3.datamodel.models.input.connector.*;
+import edu.ie3.datamodel.models.input.connector.type.LineTypeInput;
+import edu.ie3.datamodel.models.input.connector.type.Transformer2WTypeInput;
+import edu.ie3.datamodel.models.input.connector.type.Transformer3WTypeInput;
+import edu.ie3.datamodel.models.input.graphics.LineGraphicInput;
+import edu.ie3.datamodel.models.input.graphics.NodeGraphicInput;
 import edu.ie3.datamodel.models.input.system.*;
+import edu.ie3.datamodel.models.input.system.characteristic.EvCharacteristicInput;
+import edu.ie3.datamodel.models.input.system.characteristic.WecCharacteristicInput;
+import edu.ie3.datamodel.models.input.system.type.*;
 import edu.ie3.datamodel.models.input.thermal.CylindricalStorageInput;
 import edu.ie3.datamodel.models.input.thermal.ThermalBusInput;
 import edu.ie3.datamodel.models.input.thermal.ThermalHouseInput;
-import edu.ie3.datamodel.models.result.system.*;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
 import javax.measure.Quantity;
-import javax.measure.quantity.Dimensionless;
-import javax.measure.quantity.ElectricPotential;
-import javax.measure.quantity.Energy;
-import javax.measure.quantity.Power;
+import javax.measure.quantity.*;
 
 /**
- * //ToDo: Class Description
+ * Processes all {@link InputEntity}s and it's child classes
  *
  * @version 0.1
  * @since 23.03.20
  */
-public class AssetInputProcessor extends EntityProcessor<AssetInput> {
+public class InputEntityProcessor extends EntityProcessor<InputEntity> {
 
   /** The entities that can be used within this processor */
-  public static final List<Class<? extends AssetInput>> eligibleEntityClasses =
+  public static final List<Class<? extends InputEntity>> eligibleEntityClasses =
       Collections.unmodifiableList(
           Arrays.asList(
-              FixedFeedInInput.class,
-              PvInput.class,
-              WecInput.class,
+              /* InputEntity */
+              OperatorInput.class,
+              RandomLoadParameters.class,
+              WecCharacteristicInput.class,
+              EvCharacteristicInput.class,
+              /* - AssetInput */
+              NodeInput.class,
+              LineInput.class,
+              Transformer2WInput.class,
+              Transformer3WInput.class,
+              SwitchInput.class,
+              MeasurementUnitInput.class,
+              EvcsInput.class,
+              ThermalBusInput.class,
+              /* -- SystemParticipantInput */
               ChpInput.class,
               BmInput.class,
               EvInput.class,
+              FixedFeedInInput.class,
+              HpInput.class,
               LoadInput.class,
+              PvInput.class,
               StorageInput.class,
-              HpInput.class,
-              LineInput.class,
-              SwitchInput.class,
-              Transformer2WInput.class,
-              Transformer3WInput.class,
+              WecInput.class,
+              /* -- ThermalUnitInput */
               ThermalHouseInput.class,
               CylindricalStorageInput.class,
-              ThermalBusInput.class,
-              MeasurementUnitInput.class,
-              NodeInput.class,
-              EvcsInput.class));
+              /* - GraphicInput */
+              NodeGraphicInput.class,
+              LineGraphicInput.class,
+              /* - AssetTypeInput */
+              BmTypeInput.class,
+              ChpTypeInput.class,
+              EvTypeInput.class,
+              HpTypeInput.class,
+              LineTypeInput.class,
+              Transformer2WTypeInput.class,
+              Transformer3WTypeInput.class,
+              StorageTypeInput.class,
+              WecTypeInput.class));
 
-  public AssetInputProcessor(Class<? extends AssetInput> registeredClass) {
+  public InputEntityProcessor(Class<? extends InputEntity> registeredClass) {
     super(registeredClass);
   }
 
@@ -62,27 +90,28 @@ protected Optional<String> handleProcessorSpecificQuantity(
       Quantity<?> quantity, String fieldName) {
     Optional<String> normalizedQuantityValue = Optional.empty();
     switch (fieldName) {
-      case "vTarget":
+      case "energy":
+      case "eConsAnnual":
+      case "eStorage":
         normalizedQuantityValue =
-            quantityValToOptionalString(
-                quantity.asType(Dimensionless.class).to(StandardUnits.TARGET_VOLTAGE_MAGNITUDE));
+            quantityValToOptionalString(quantity.asType(Energy.class).to(StandardUnits.ENERGY_IN));
         break;
-      case "vrated":
+      case "q":
         normalizedQuantityValue =
             quantityValToOptionalString(
-                quantity.asType(ElectricPotential.class).to(StandardUnits.RATED_VOLTAGE_MAGNITUDE));
+                quantity.asType(Power.class).to(StandardUnits.REACTIVE_POWER_IN));
         break;
-      case "sRated":
+      case "p":
+      case "pMax":
+      case "pOwn":
+      case "pThermal":
         normalizedQuantityValue =
-            quantityValToOptionalString(quantity.asType(Power.class).to(StandardUnits.S_RATED));
-        break;
-      case "eConsAnnual":
-        normalizedQuantityValue =
-            quantityValToOptionalString(quantity.asType(Energy.class).to(StandardUnits.ENERGY_IN));
+            quantityValToOptionalString(
+                quantity.asType(Power.class).to(StandardUnits.ACTIVE_POWER_IN));
         break;
       default:
         log.error(
-            "Cannot process quantity with value '{}' for field with name {} in result entity processing!",
+            "Cannot process quantity with value '{}' for field with name {} in input entity processing!",
             quantity,
             fieldName);
         break;
@@ -91,7 +120,7 @@ protected Optional<String> handleProcessorSpecificQuantity(
   }
 
   @Override
-  protected List<Class<? extends AssetInput>> getAllEligibleClasses() {
+  protected List<Class<? extends InputEntity>> getAllEligibleClasses() {
     return eligibleEntityClasses;
   }
 }
diff --git a/src/main/java/edu/ie3/datamodel/io/processor/result/ResultEntityProcessor.java b/src/main/java/edu/ie3/datamodel/io/processor/result/ResultEntityProcessor.java
index 691a34976..15bf00696 100644
--- a/src/main/java/edu/ie3/datamodel/io/processor/result/ResultEntityProcessor.java
+++ b/src/main/java/edu/ie3/datamodel/io/processor/result/ResultEntityProcessor.java
@@ -63,20 +63,25 @@ protected Optional<String> handleProcessorSpecificQuantity(
       Quantity<?> quantity, String fieldName) {
     Optional<String> normalizedQuantityValue = Optional.empty();
     switch (fieldName) {
-      case "p":
+      case "energy":
+      case "eConsAnnual":
+      case "eStorage":
         normalizedQuantityValue =
             quantityValToOptionalString(
-                quantity.asType(Power.class).to(StandardUnits.ACTIVE_POWER_RESULT));
+                quantity.asType(Energy.class).to(StandardUnits.ENERGY_RESULT));
         break;
       case "q":
         normalizedQuantityValue =
             quantityValToOptionalString(
                 quantity.asType(Power.class).to(StandardUnits.REACTIVE_POWER_RESULT));
         break;
-      case "energy":
+      case "p":
+      case "pMax":
+      case "pOwn":
+      case "pThermal":
         normalizedQuantityValue =
             quantityValToOptionalString(
-                quantity.asType(Energy.class).to(StandardUnits.ENERGY_RESULT));
+                quantity.asType(Power.class).to(StandardUnits.ACTIVE_POWER_RESULT));
         break;
       default:
         log.error(
diff --git a/src/main/java/edu/ie3/datamodel/models/StandardUnits.java b/src/main/java/edu/ie3/datamodel/models/StandardUnits.java
index 42f311e2e..d472c05fc 100644
--- a/src/main/java/edu/ie3/datamodel/models/StandardUnits.java
+++ b/src/main/java/edu/ie3/datamodel/models/StandardUnits.java
@@ -65,9 +65,9 @@ public class StandardUnits {
   public static final Unit<Angle> DPHI_TAP = DEGREE_GEOM;
   /**
    * Gradient, with which a system participant can change it's set point (with regard to rated
-   * power)
+   * active power = rated apparent power * rated power factor)
    */
-  public static final Unit<DimensionlessRate> LOAD_GRADIENT = PERCENT_PER_HOUR;
+  public static final Unit<DimensionlessRate> ACTIVE_POWER_GRADIENT = PERCENT_PER_HOUR;
   /** Efficiency of a process */
   public static final Unit<Dimensionless> EFFICIENCY = PERCENT;
   /** Volume */
@@ -89,10 +89,8 @@ public class StandardUnits {
   public static final Unit<ThermalConductance> THERMAL_TRANSMISSION = KILOWATT_PER_KELVIN;
   /** Depth of discharge */
   public static final Unit<Dimensionless> DOD = PERCENT;
-  /** Charge/Discharge Rate (constant power) */
-  public static final Unit<DimensionlessRate> CP_RATE = PU_PER_HOUR;
   /** Life time of a system */
-  public static final Unit<Time> LIFE_TIME = MILLISECOND;
+  public static final Unit<Time> LIFE_TIME = HOUR;
   /** Area covered by the rotor of a wind energy converter */
   public static final Unit<Area> ROTOR_AREA = SQUARE_METRE;
   /** Height of the hub of an wind energy converter */
diff --git a/src/main/java/edu/ie3/datamodel/models/input/OperatorInput.java b/src/main/java/edu/ie3/datamodel/models/input/OperatorInput.java
index 357be2742..be4e33671 100644
--- a/src/main/java/edu/ie3/datamodel/models/input/OperatorInput.java
+++ b/src/main/java/edu/ie3/datamodel/models/input/OperatorInput.java
@@ -14,17 +14,17 @@ public class OperatorInput extends InputEntity {
   public static final OperatorInput NO_OPERATOR_ASSIGNED =
       new OperatorInput(UUID.randomUUID(), "NO_OPERATOR_ASSIGNED");
 
-  /** The name of this operator */
-  private final String name;
+  /** The id (=name) of this operator */
+  private final String id;
 
-  /** @param name of this operator */
-  public OperatorInput(UUID uuid, String name) {
+  /** @param id of this operator */
+  public OperatorInput(UUID uuid, String id) {
     super(uuid);
-    this.name = name;
+    this.id = id;
   }
 
-  public String getName() {
-    return name;
+  public String getId() {
+    return id;
   }
 
   @Override
@@ -33,16 +33,16 @@ public boolean equals(Object o) {
     if (o == null || getClass() != o.getClass()) return false;
     if (!super.equals(o)) return false;
     OperatorInput that = (OperatorInput) o;
-    return Objects.equals(name, that.name);
+    return Objects.equals(id, that.id);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(super.hashCode(), name);
+    return Objects.hash(super.hashCode(), id);
   }
 
   @Override
   public String toString() {
-    return "OperatorInput{" + "name='" + name + '\'' + '}';
+    return "OperatorInput{" + "id='" + id + '\'' + '}';
   }
 }
diff --git a/src/main/java/edu/ie3/datamodel/models/input/connector/LineInput.java b/src/main/java/edu/ie3/datamodel/models/input/connector/LineInput.java
index b3c5608b9..1b6715150 100644
--- a/src/main/java/edu/ie3/datamodel/models/input/connector/LineInput.java
+++ b/src/main/java/edu/ie3/datamodel/models/input/connector/LineInput.java
@@ -6,6 +6,7 @@
 package edu.ie3.datamodel.models.input.connector;
 
 import edu.ie3.datamodel.models.OperationTime;
+import edu.ie3.datamodel.models.StandardUnits;
 import edu.ie3.datamodel.models.input.NodeInput;
 import edu.ie3.datamodel.models.input.OperatorInput;
 import edu.ie3.datamodel.models.input.connector.type.LineTypeInput;
@@ -60,7 +61,7 @@ public LineInput(
       Optional<String> olmCharacteristic) {
     super(uuid, operationTime, operator, id, nodeA, nodeB, parallelDevices);
     this.type = type;
-    this.length = length;
+    this.length = length.to(StandardUnits.LINE_LENGTH);
     this.geoPosition = geoPosition;
     this.olmCharacteristic = olmCharacteristic;
   }
diff --git a/src/main/java/edu/ie3/datamodel/models/input/system/characteristic/AssetCharacteristicInput.java b/src/main/java/edu/ie3/datamodel/models/input/system/characteristic/AssetCharacteristicInput.java
index d59c6acec..67ea87e18 100644
--- a/src/main/java/edu/ie3/datamodel/models/input/system/characteristic/AssetCharacteristicInput.java
+++ b/src/main/java/edu/ie3/datamodel/models/input/system/characteristic/AssetCharacteristicInput.java
@@ -5,45 +5,61 @@
 */
 package edu.ie3.datamodel.models.input.system.characteristic;
 
+import edu.ie3.datamodel.models.input.AssetTypeInput;
 import edu.ie3.datamodel.models.input.InputEntity;
 import java.util.Objects;
 import java.util.UUID;
 
 /** Describes characteristics of assets */
-public abstract class AssetCharacteristicInput extends InputEntity {
+public abstract class AssetCharacteristicInput<T extends AssetTypeInput> extends InputEntity {
 
   /** Type name of this characteristic */
-  private final String type;
+  protected final T type;
+
+  /** Actual characteristic */
+  protected final String characteristic;
 
   /**
    * @param uuid of the input entity
    * @param type The type name of this characteristic
+   * @param characteristic Actual characteristic
    */
-  public AssetCharacteristicInput(UUID uuid, String type) {
+  public AssetCharacteristicInput(UUID uuid, T type, String characteristic) {
     super(uuid);
     this.type = type;
+    this.characteristic = characteristic;
   }
 
-  public String getType() {
+  public T getType() {
     return type;
   }
 
+  public String getCharacteristic() {
+    return characteristic;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) return true;
     if (o == null || getClass() != o.getClass()) return false;
     if (!super.equals(o)) return false;
-    AssetCharacteristicInput that = (AssetCharacteristicInput) o;
-    return Objects.equals(type, that.type);
+    AssetCharacteristicInput<?> that = (AssetCharacteristicInput<?>) o;
+    return type.equals(that.type) && characteristic.equals(that.characteristic);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(super.hashCode(), type);
+    return Objects.hash(super.hashCode(), type, characteristic);
   }
 
   @Override
   public String toString() {
-    return "AssetCharacteristicInput{" + "type='" + type + '\'' + '}';
+    return "AssetCharacteristicInput{"
+        + "type="
+        + type
+        + ", characteristic='"
+        + characteristic
+        + '\''
+        + '}';
   }
 }
diff --git a/src/main/java/edu/ie3/datamodel/models/input/system/characteristic/EvCharacteristicInput.java b/src/main/java/edu/ie3/datamodel/models/input/system/characteristic/EvCharacteristicInput.java
index 47567fd72..bc7c82803 100644
--- a/src/main/java/edu/ie3/datamodel/models/input/system/characteristic/EvCharacteristicInput.java
+++ b/src/main/java/edu/ie3/datamodel/models/input/system/characteristic/EvCharacteristicInput.java
@@ -5,16 +5,27 @@
 */
 package edu.ie3.datamodel.models.input.system.characteristic;
 
+import edu.ie3.datamodel.models.input.system.type.EvTypeInput;
 import java.util.UUID;
 
-public class EvCharacteristicInput extends AssetCharacteristicInput {
+public class EvCharacteristicInput extends AssetCharacteristicInput<EvTypeInput> {
 
   /** @deprecated only added to remove compile error. Please implement a real constructor */
   @Deprecated
-  public EvCharacteristicInput(UUID uuid, String type) {
-    super(uuid, type);
+  public EvCharacteristicInput(UUID uuid, EvTypeInput type, String characteristic) {
+    super(uuid, type, characteristic);
   }
 
   // TODO please fill the void inside me :'(
 
+  @Override
+  public String toString() {
+    return "EvCharacteristicInput{"
+        + "type="
+        + type
+        + ", characteristic='"
+        + characteristic
+        + '\''
+        + '}';
+  }
 }
diff --git a/src/main/java/edu/ie3/datamodel/models/input/system/characteristic/WecCharacteristicInput.java b/src/main/java/edu/ie3/datamodel/models/input/system/characteristic/WecCharacteristicInput.java
index 165ba04ba..6b646f5e5 100644
--- a/src/main/java/edu/ie3/datamodel/models/input/system/characteristic/WecCharacteristicInput.java
+++ b/src/main/java/edu/ie3/datamodel/models/input/system/characteristic/WecCharacteristicInput.java
@@ -5,44 +5,28 @@
 */
 package edu.ie3.datamodel.models.input.system.characteristic;
 
-import java.util.Objects;
+import edu.ie3.datamodel.models.input.system.type.WecTypeInput;
 import java.util.UUID;
 
 /** Characteristic mapping the wind velocity to its corresponding Betz coefficient */
-public class WecCharacteristicInput extends AssetCharacteristicInput {
-  /** Curve of the Betz coefficient as semicolon-separated String */
-  private final String cpCharacteristic;
-
+public class WecCharacteristicInput extends AssetCharacteristicInput<WecTypeInput> {
   /**
    * @param uuid of the input entity
    * @param type of this characteristic
-   * @param cpCharacteristic Power curve as semicolon-separated String
+   * @param characteristic Curve of the Betz coefficient in the form "{(v1,cp1),(v2,cp2), ...}"
    */
-  public WecCharacteristicInput(UUID uuid, String type, String cpCharacteristic) {
-    super(uuid, type);
-    this.cpCharacteristic = cpCharacteristic;
-  }
-
-  public String getCpCharacteristic() {
-    return cpCharacteristic;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-    if (!super.equals(o)) return false;
-    WecCharacteristicInput that = (WecCharacteristicInput) o;
-    return Objects.equals(cpCharacteristic, that.cpCharacteristic);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(super.hashCode(), cpCharacteristic);
+  public WecCharacteristicInput(UUID uuid, WecTypeInput type, String characteristic) {
+    super(uuid, type, characteristic);
   }
 
   @Override
   public String toString() {
-    return "WecCharacteristicInput{" + "cpCharacteristic='" + cpCharacteristic + '\'' + '}';
+    return "WecCharacteristicInput{"
+        + "type="
+        + type
+        + ", characteristic='"
+        + characteristic
+        + '\''
+        + '}';
   }
 }
diff --git a/src/main/java/edu/ie3/datamodel/models/input/system/type/BmTypeInput.java b/src/main/java/edu/ie3/datamodel/models/input/system/type/BmTypeInput.java
index 2fd66bf58..25b7d23a6 100644
--- a/src/main/java/edu/ie3/datamodel/models/input/system/type/BmTypeInput.java
+++ b/src/main/java/edu/ie3/datamodel/models/input/system/type/BmTypeInput.java
@@ -19,7 +19,7 @@
 public class BmTypeInput extends SystemParticipantTypeInput {
 
   /** Permissible load gradient (typically in %/h) */
-  private final Quantity<DimensionlessRate> loadGradient;
+  private final Quantity<DimensionlessRate> activePowerGradient;
   /** Efficiency of converter for this type of BM (typically in %) */
   private final Quantity<Dimensionless> etaConv;
 
@@ -29,7 +29,7 @@ public class BmTypeInput extends SystemParticipantTypeInput {
    * @param capex Capital expense for this type of BM (typically in €)
    * @param opex Operating expense for this type of BM (typically in €)
    * @param cosphiRated Power factor for this type of BM
-   * @param loadGradient Permissible load gradient
+   * @param activePowerGradient Maximum permissible gradient of active power change
    * @param sRated Rated apparent power for this type of BM (typically in kVA)
    * @param etaConv Efficiency of converter for this type of BM (typically in %)
    */
@@ -38,17 +38,17 @@ public BmTypeInput(
       String id,
       Quantity<Currency> capex,
       Quantity<EnergyPrice> opex,
-      Quantity<DimensionlessRate> loadGradient,
+      Quantity<DimensionlessRate> activePowerGradient,
       Quantity<Power> sRated,
       double cosphiRated,
       Quantity<Dimensionless> etaConv) {
     super(uuid, id, capex, opex, sRated.to(StandardUnits.S_RATED), cosphiRated);
-    this.loadGradient = loadGradient.to(StandardUnits.LOAD_GRADIENT);
+    this.activePowerGradient = activePowerGradient.to(StandardUnits.ACTIVE_POWER_GRADIENT);
     this.etaConv = etaConv.to(StandardUnits.EFFICIENCY);
   }
 
-  public Quantity<DimensionlessRate> getLoadGradient() {
-    return loadGradient;
+  public Quantity<DimensionlessRate> getActivePowerGradient() {
+    return activePowerGradient;
   }
 
   public Quantity<Dimensionless> getEtaConv() {
@@ -61,16 +61,16 @@ public boolean equals(Object o) {
     if (o == null || getClass() != o.getClass()) return false;
     if (!super.equals(o)) return false;
     BmTypeInput that = (BmTypeInput) o;
-    return loadGradient.equals(that.loadGradient) && etaConv.equals(that.etaConv);
+    return activePowerGradient.equals(that.activePowerGradient) && etaConv.equals(that.etaConv);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(super.hashCode(), loadGradient, etaConv);
+    return Objects.hash(super.hashCode(), activePowerGradient, etaConv);
   }
 
   @Override
   public String toString() {
-    return "BmTypeInput{" + "loadGradient=" + loadGradient + ", etaConv=" + etaConv + '}';
+    return "BmTypeInput{" + "loadGradient=" + activePowerGradient + ", etaConv=" + etaConv + '}';
   }
 }
diff --git a/src/main/java/edu/ie3/datamodel/models/input/system/type/StorageTypeInput.java b/src/main/java/edu/ie3/datamodel/models/input/system/type/StorageTypeInput.java
index 638e8c170..5667d4adb 100644
--- a/src/main/java/edu/ie3/datamodel/models/input/system/type/StorageTypeInput.java
+++ b/src/main/java/edu/ie3/datamodel/models/input/system/type/StorageTypeInput.java
@@ -23,8 +23,8 @@ public class StorageTypeInput extends SystemParticipantTypeInput {
   private final Quantity<Energy> eStorage;
   /** Maximum permissible active power (typically in kW) */
   private final Quantity<Power> pMax;
-  /** Charging/Discharging rate at constant power (typically per unit) */
-  private final Quantity<DimensionlessRate> cpRate;
+  /** Maximum permissible gradient of active power change (typically % / h) */
+  private final Quantity<DimensionlessRate> activePowerGradient;
   /** Efficiency of the charging and discharging process (typically in %) */
   private final Quantity<Dimensionless> eta;
   /** Minimum permissible depth of discharge (typically in %) */
@@ -41,9 +41,9 @@ public class StorageTypeInput extends SystemParticipantTypeInput {
    * @param opex operating expense for this type of Storage (typically in €/MWh)
    * @param eStorage stored energy capacity
    * @param sRated Rated apparent power of integrated inverter
-   * @param cosphiRated power factor for integrated inverter
-   * @param pMax maximum permissible charge/discharge power
-   * @param cpRate charging/discharging rate (constant power)
+   * @param cosPhiRated power factor for integrated inverter
+   * @param pMax maximum permissible active power of the integrated inverter
+   * @param activePowerGradient maximum permissible gradient of active power change
    * @param eta efficiency of the charging and discharging process
    * @param dod maximum permissible depth of discharge
    * @param lifeTime maximum life time of the storage
@@ -56,17 +56,17 @@ public StorageTypeInput(
       Quantity<EnergyPrice> opex,
       Quantity<Energy> eStorage,
       Quantity<Power> sRated,
-      double cosphiRated,
+      double cosPhiRated,
       Quantity<Power> pMax,
-      Quantity<DimensionlessRate> cpRate,
+      Quantity<DimensionlessRate> activePowerGradient,
       Quantity<Dimensionless> eta,
       Quantity<Dimensionless> dod,
       Quantity<Time> lifeTime,
       int lifeCycle) {
-    super(uuid, id, capex, opex, sRated.to(StandardUnits.S_RATED), cosphiRated);
+    super(uuid, id, capex, opex, sRated.to(StandardUnits.S_RATED), cosPhiRated);
     this.eStorage = eStorage.to(StandardUnits.ENERGY_IN);
     this.pMax = pMax.to(StandardUnits.ACTIVE_POWER_IN);
-    this.cpRate = cpRate.to(StandardUnits.CP_RATE);
+    this.activePowerGradient = activePowerGradient.to(StandardUnits.ACTIVE_POWER_GRADIENT);
     this.eta = eta.to(StandardUnits.EFFICIENCY);
     this.dod = dod.to(StandardUnits.DOD);
     this.lifeTime = lifeTime.to(StandardUnits.LIFE_TIME);
@@ -97,8 +97,8 @@ public Quantity<Power> getpMax() {
     return pMax;
   }
 
-  public Quantity<DimensionlessRate> getcpRate() {
-    return cpRate;
+  public Quantity<DimensionlessRate> getActivePowerGradient() {
+    return activePowerGradient;
   }
 
   @Override
@@ -110,7 +110,7 @@ public boolean equals(Object o) {
     return lifeCycle == that.lifeCycle
         && eStorage.equals(that.eStorage)
         && pMax.equals(that.pMax)
-        && cpRate.equals(that.cpRate)
+        && activePowerGradient.equals(that.activePowerGradient)
         && eta.equals(that.eta)
         && dod.equals(that.dod)
         && lifeTime.equals(that.lifeTime);
@@ -118,7 +118,8 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(super.hashCode(), eStorage, pMax, cpRate, eta, dod, lifeTime, lifeCycle);
+    return Objects.hash(
+        super.hashCode(), eStorage, pMax, activePowerGradient, eta, dod, lifeTime, lifeCycle);
   }
 
   @Override
@@ -129,7 +130,7 @@ public String toString() {
         + ", pMax="
         + pMax
         + ", cpRate="
-        + cpRate
+        + activePowerGradient
         + ", eta="
         + eta
         + ", dod="
diff --git a/src/test/groovy/edu/ie3/datamodel/io/factory/typeinput/SystemParticipantTypeInputFactoryTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/factory/typeinput/SystemParticipantTypeInputFactoryTest.groovy
index 2b503683c..c8802c832 100644
--- a/src/test/groovy/edu/ie3/datamodel/io/factory/typeinput/SystemParticipantTypeInputFactoryTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/io/factory/typeinput/SystemParticipantTypeInputFactoryTest.groovy
@@ -110,8 +110,7 @@ class SystemParticipantTypeInputFactoryTest extends Specification implements Fac
 			"opex":	        "4",
 			"srated":       "5",
 			"cosphi":	    "6",
-
-			"loadgradient":	"7",
+			"activepowergradient":	"7",
 			"etaconv":      "8"
 		]
 		def typeInputClass = BmTypeInput
@@ -131,7 +130,7 @@ class SystemParticipantTypeInputFactoryTest extends Specification implements Fac
 			assert sRated == getQuant(parameter["srated"], StandardUnits.S_RATED)
 			assert cosphiRated == Double.parseDouble(parameter["cosphi"])
 
-			assert loadGradient == getQuant(parameter["loadgradient"], StandardUnits.LOAD_GRADIENT)
+			assert activePowerGradient == getQuant(parameter["activepowergradient"], StandardUnits.ACTIVE_POWER_GRADIENT)
 			assert etaConv == getQuant(parameter["etaconv"], StandardUnits.EFFICIENCY)
 		}
 	}
@@ -218,20 +217,20 @@ class SystemParticipantTypeInputFactoryTest extends Specification implements Fac
 		given: "a system participant input type factory and model data"
 		def typeInputFactory = new SystemParticipantTypeInputFactory()
 		Map<String, String> parameter = [
-			"uuid":	        "91ec3bcf-1777-4d38-af67-0bf7c9fa73c7",
-			"id":	        "blablub",
-			"capex":        "3",
-			"opex":	        "4",
-			"srated":       "5",
-			"cosphi":	    "6",
-
-			"estorage":	    "6",
-			"pmax":	        "8",
-			"cprate":       "1",
-			"eta":	        "9",
-			"dod":	        "10",
-			"lifetime":	    "11",
-			"lifecycle":    "12"
+			"uuid"                  : "91ec3bcf-1777-4d38-af67-0bf7c9fa73c7",
+			"id"                    : "blablub",
+			"capex"                 : "3",
+			"opex"                  : "4",
+			"srated"                : "5",
+			"cosphi"                : "6",
+
+			"estorage"              : "6",
+			"pmax"                  : "8",
+			"activepowergradient"   : "1",
+			"eta"                   : "9",
+			"dod"                   : "10",
+			"lifetime"              : "11",
+			"lifecycle"             : "12"
 		]
 		def typeInputClass = StorageTypeInput
 
@@ -252,7 +251,7 @@ class SystemParticipantTypeInputFactoryTest extends Specification implements Fac
 
 			assert eStorage == getQuant(parameter["estorage"], StandardUnits.ENERGY_IN)
 			assert pMax == getQuant(parameter["pmax"], StandardUnits.ACTIVE_POWER_IN)
-			assert cpRate == getQuant(parameter["cprate"], StandardUnits.CP_RATE)
+			assert activePowerGradient == getQuant(parameter["activepowergradient"], StandardUnits.ACTIVE_POWER_GRADIENT)
 			assert eta == getQuant(parameter["eta"], StandardUnits.EFFICIENCY)
 			assert dod == getQuant(parameter["dod"], StandardUnits.DOD)
 			assert lifeTime == getQuant(parameter["lifetime"], StandardUnits.LIFE_TIME)
@@ -286,6 +285,6 @@ class SystemParticipantTypeInputFactoryTest extends Specification implements Fac
 		FactoryException ex = thrown()
 		ex.message == "The provided fields [capex, cosphi, dod, estorage, eta, id, lifetime, opex, pmax, pmin, srated, uuid] with data {capex -> 3,cosphi -> 6,dod -> 10,estorage -> 6,eta -> 9,id -> blablub,lifetime -> 11,opex -> 4,pmax -> 8,pmin -> 7,srated -> 5,uuid -> 91ec3bcf-1777-4d38-af67-0bf7c9fa73c7} are invalid for instance of StorageTypeInput. \n" +
 				"The following fields to be passed to a constructor of StorageTypeInput are possible:\n" +
-				"0: [capex, cosphi, cprate, dod, estorage, eta, id, lifecycle, lifetime, opex, pmax, srated, uuid]\n"
+				"0: [activepowergradient, capex, cosphi, dod, estorage, eta, id, lifecycle, lifetime, opex, pmax, srated, uuid]\n"
 	}
 }
diff --git a/src/test/groovy/edu/ie3/datamodel/io/processor/ProcessorProviderTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/processor/ProcessorProviderTest.groovy
index d9faeea11..fcd16fba9 100644
--- a/src/test/groovy/edu/ie3/datamodel/io/processor/ProcessorProviderTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/io/processor/ProcessorProviderTest.groovy
@@ -10,10 +10,15 @@ import edu.ie3.datamodel.models.StandardUnits
 import edu.ie3.datamodel.models.input.EvcsInput
 import edu.ie3.datamodel.models.input.MeasurementUnitInput
 import edu.ie3.datamodel.models.input.NodeInput
+import edu.ie3.datamodel.models.input.OperatorInput
+import edu.ie3.datamodel.models.input.RandomLoadParameters
 import edu.ie3.datamodel.models.input.connector.LineInput
 import edu.ie3.datamodel.models.input.connector.SwitchInput
 import edu.ie3.datamodel.models.input.connector.Transformer2WInput
 import edu.ie3.datamodel.models.input.connector.Transformer3WInput
+import edu.ie3.datamodel.models.input.connector.type.LineTypeInput
+import edu.ie3.datamodel.models.input.connector.type.Transformer2WTypeInput
+import edu.ie3.datamodel.models.input.connector.type.Transformer3WTypeInput
 import edu.ie3.datamodel.models.input.graphics.LineGraphicInput
 import edu.ie3.datamodel.models.input.graphics.NodeGraphicInput
 import edu.ie3.datamodel.models.input.system.BmInput
@@ -25,6 +30,14 @@ import edu.ie3.datamodel.models.input.system.LoadInput
 import edu.ie3.datamodel.models.input.system.PvInput
 import edu.ie3.datamodel.models.input.system.StorageInput
 import edu.ie3.datamodel.models.input.system.WecInput
+import edu.ie3.datamodel.models.input.system.characteristic.EvCharacteristicInput
+import edu.ie3.datamodel.models.input.system.characteristic.WecCharacteristicInput
+import edu.ie3.datamodel.models.input.system.type.BmTypeInput
+import edu.ie3.datamodel.models.input.system.type.ChpTypeInput
+import edu.ie3.datamodel.models.input.system.type.EvTypeInput
+import edu.ie3.datamodel.models.input.system.type.HpTypeInput
+import edu.ie3.datamodel.models.input.system.type.StorageTypeInput
+import edu.ie3.datamodel.models.input.system.type.WecTypeInput
 import edu.ie3.datamodel.models.input.thermal.CylindricalStorageInput
 import edu.ie3.datamodel.models.input.thermal.ThermalBusInput
 import edu.ie3.datamodel.models.input.thermal.ThermalHouseInput
@@ -57,30 +70,48 @@ class ProcessorProviderTest extends Specification {
 		given:
 		ProcessorProvider provider = new ProcessorProvider()
 
-		// currently known processors
 		List knownProcessors = [
-			FixedFeedInInput,
-			PvInput,
-			WecInput,
+			/* InputEntity */
+			OperatorInput,
+			RandomLoadParameters,
+			WecCharacteristicInput,
+			EvCharacteristicInput,
+			/* - AssetInput */
+			NodeInput,
+			LineInput,
+			Transformer2WInput,
+			Transformer3WInput,
+			SwitchInput,
+			MeasurementUnitInput,
+			EvcsInput,
+			ThermalBusInput,
+			/* -- SystemParticipantInput */
 			ChpInput,
 			BmInput,
 			EvInput,
+			FixedFeedInInput,
+			HpInput,
 			LoadInput,
+			PvInput,
 			StorageInput,
-			HpInput,
-			LineInput,
-			SwitchInput,
-			Transformer2WInput,
-			Transformer3WInput,
+			WecInput,
+			/* -- ThermalUnitInput */
 			ThermalHouseInput,
 			CylindricalStorageInput,
-			ThermalBusInput,
-			MeasurementUnitInput,
-			NodeInput,
-			EvcsInput,
-			LoadResult,
+			/* - GraphicInput */
 			NodeGraphicInput,
 			LineGraphicInput,
+			/* - AssetTypeInput */
+			BmTypeInput,
+			ChpTypeInput,
+			EvTypeInput,
+			HpTypeInput,
+			LineTypeInput,
+			Transformer2WTypeInput,
+			Transformer3WTypeInput,
+			StorageTypeInput,
+			WecTypeInput,
+			/* ResultEntity */
 			FixedFeedInResult,
 			BmResult,
 			PvResult,
@@ -92,11 +123,13 @@ class ProcessorProviderTest extends Specification {
 			Transformer2WResult,
 			Transformer3WResult,
 			LineResult,
+			LoadResult,
 			SwitchResult,
 			NodeResult,
 			ThermalHouseResult,
 			CylindricalStorageResult
 		]
+		// currently known processors
 
 		expect:
 		provider.registeredClasses.size() == knownProcessors.size()
diff --git a/src/test/groovy/edu/ie3/datamodel/io/processor/input/GraphicInputProcessorTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/processor/input/GraphicInputProcessorTest.groovy
deleted file mode 100644
index a86647d3b..000000000
--- a/src/test/groovy/edu/ie3/datamodel/io/processor/input/GraphicInputProcessorTest.groovy
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * © 2020. TU Dortmund University,
- * Institute of Energy Systems, Energy Efficiency and Energy Economics,
- * Research group Distribution grid planning and operation
- */
-package edu.ie3.datamodel.io.processor.input
-
-import edu.ie3.datamodel.models.input.graphics.LineGraphicInput
-import edu.ie3.datamodel.models.input.graphics.NodeGraphicInput
-import edu.ie3.test.common.GridTestData
-import edu.ie3.util.TimeTools
-import spock.lang.Specification
-
-import java.time.ZoneId
-
-class GraphicInputProcessorTest extends Specification {
-	static {
-		TimeTools.initialize(ZoneId.of("UTC"), Locale.GERMANY, "yyyy-MM-dd HH:mm:ss")
-	}
-
-	def "The GraphicInputProcessor should de-serialize a provided NodeGraphicInput with point correctly"(){
-		given:
-		GraphicInputProcessor processor = new GraphicInputProcessor(NodeGraphicInput.class)
-		NodeGraphicInput validNode = GridTestData.nodeGraphicC
-		Map expected = [
-			"uuid"          : "09aec636-791b-45aa-b981-b14edf171c4c",
-			"graphicLayer"  : "main",
-			"path"          : "",
-			"point"         : "{\"type\":\"Point\",\"coordinates\":[0.0,10],\"crs\":{\"type\":\"name\",\"properties\":{\"name\":\"EPSG:4326\"}}}",
-			"node"          : "bd837a25-58f3-44ac-aa90-c6b6e3cd91b2"
-		]
-
-		when:
-		Optional<LinkedHashMap<String, String>> actual = processor.handleEntity(validNode)
-
-		then:
-		actual.isPresent()
-		actual.get() == expected
-	}
-
-	def "The GraphicInputProcessor should de-serialize a provided NodeGraphicInput with path correctly"(){
-		given:
-		GraphicInputProcessor processor = new GraphicInputProcessor(NodeGraphicInput.class)
-		NodeGraphicInput validNode = GridTestData.nodeGraphicD
-		Map expected = [
-			"uuid"          : "9ecad435-bd16-4797-a732-762c09d4af25",
-			"graphicLayer"  : "main",
-			"path"          : "{\"type\":\"LineString\",\"coordinates\":[[-1,0.0],[1,0.0]],\"crs\":{\"type\":\"name\",\"properties\":{\"name\":\"EPSG:4326\"}}}",
-			"point"         : "",
-			"node"          : "6e0980e0-10f2-4e18-862b-eb2b7c90509b"
-		]
-
-		when:
-		Optional<LinkedHashMap<String, String>> actual = processor.handleEntity(validNode)
-
-		then:
-		actual.isPresent()
-		actual.get() == expected
-	}
-
-	def "The GraphicInputProcessor should de-serialize a provided LineGraphicInput correctly"(){
-		given:
-		GraphicInputProcessor processor = new GraphicInputProcessor(LineGraphicInput.class)
-		LineGraphicInput validNode = GridTestData.lineGraphicCtoD
-		Map expected = [
-			"uuid"          : "ece86139-3238-4a35-9361-457ecb4258b0",
-			"graphicLayer"  : "main",
-			"path"          : "{\"type\":\"LineString\",\"coordinates\":[[0.0,0.0],[0.0,10]],\"crs\":{\"type\":\"name\",\"properties\":{\"name\":\"EPSG:4326\"}}}",
-			"line"          : "91ec3bcf-1777-4d38-af67-0bf7c9fa73c7"
-		]
-
-		when:
-		Optional<LinkedHashMap<String, String>> actual = processor.handleEntity(validNode)
-
-		then:
-		actual.isPresent()
-		actual.get() == expected
-	}
-}
diff --git a/src/test/groovy/edu/ie3/datamodel/io/processor/input/AssetInputProcessorTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/processor/input/InputEntityProcessorTest.groovy
similarity index 54%
rename from src/test/groovy/edu/ie3/datamodel/io/processor/input/AssetInputProcessorTest.groovy
rename to src/test/groovy/edu/ie3/datamodel/io/processor/input/InputEntityProcessorTest.groovy
index a8c7c9614..cc7f8301c 100644
--- a/src/test/groovy/edu/ie3/datamodel/io/processor/input/AssetInputProcessorTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/io/processor/input/InputEntityProcessorTest.groovy
@@ -7,10 +7,17 @@ package edu.ie3.datamodel.io.processor.input
 
 import edu.ie3.datamodel.models.StandardUnits
 import edu.ie3.datamodel.models.input.NodeInput
+import edu.ie3.datamodel.models.input.OperatorInput
+import edu.ie3.datamodel.models.input.RandomLoadParameters
 import edu.ie3.datamodel.models.input.connector.LineInput
 import edu.ie3.datamodel.models.input.connector.SwitchInput
 import edu.ie3.datamodel.models.input.connector.Transformer2WInput
 import edu.ie3.datamodel.models.input.connector.Transformer3WInput
+import edu.ie3.datamodel.models.input.connector.type.LineTypeInput
+import edu.ie3.datamodel.models.input.connector.type.Transformer2WTypeInput
+import edu.ie3.datamodel.models.input.connector.type.Transformer3WTypeInput
+import edu.ie3.datamodel.models.input.graphics.LineGraphicInput
+import edu.ie3.datamodel.models.input.graphics.NodeGraphicInput
 import edu.ie3.datamodel.models.input.system.BmInput
 import edu.ie3.datamodel.models.input.system.ChpInput
 import edu.ie3.datamodel.models.input.system.EvInput
@@ -20,8 +27,16 @@ import edu.ie3.datamodel.models.input.system.LoadInput
 import edu.ie3.datamodel.models.input.system.PvInput
 import edu.ie3.datamodel.models.input.system.StorageInput
 import edu.ie3.datamodel.models.input.system.WecInput
+import edu.ie3.datamodel.models.input.system.characteristic.WecCharacteristicInput
+import edu.ie3.datamodel.models.input.system.type.BmTypeInput
+import edu.ie3.datamodel.models.input.system.type.ChpTypeInput
+import edu.ie3.datamodel.models.input.system.type.EvTypeInput
+import edu.ie3.datamodel.models.input.system.type.HpTypeInput
+import edu.ie3.datamodel.models.input.system.type.StorageTypeInput
+import edu.ie3.datamodel.models.input.system.type.WecTypeInput
 import edu.ie3.test.common.GridTestData
 import edu.ie3.test.common.SystemParticipantTestData
+import edu.ie3.test.common.TypeTestData
 import edu.ie3.util.TimeTools
 import spock.lang.Specification
 
@@ -29,17 +44,19 @@ import java.time.ZoneId
 import java.time.ZonedDateTime
 
 /**
- * //ToDo: Class Description
+ * Testing the function of processors
  *
- * @version 0.1* @since 24.03.20
+ * @version 0.1
+ * @since 24.03.20
  */
-class AssetInputProcessorTest extends Specification {
-
+class InputEntityProcessorTest extends Specification {
+	static {
+		TimeTools.initialize(ZoneId.of("UTC"), Locale.GERMANY, "yyyy-MM-dd HH:mm:ss")
+	}
 
-	def "A AssetInputProcessor should de-serialize a provided NodeInput correctly"() {
+	def "A InputEntityProcessor should de-serialize a provided NodeInput correctly"() {
 		given:
-		TimeTools.initialize(ZoneId.of("UTC"), Locale.GERMANY, "yyyy-MM-dd HH:mm:ss")
-		def assetInputProcessor = new AssetInputProcessor(NodeInput)
+		def processor = new InputEntityProcessor(NodeInput)
 		def validResult = GridTestData.nodeA
 
 		Map expectedResults = [
@@ -52,13 +69,12 @@ class AssetInputProcessorTest extends Specification {
 			"slack"        : "true",
 			"subnet"       : "1",
 			"vTarget"      : "1.0",
-			"voltlvl"      : "Höchstspannung",
-			"vrated"       : "380.0"
+			"voltLvl"      : "Höchstspannung",
+			"vRated"       : "380.0"
 		]
 
 		when: "the entity is passed to the processor"
-		def processingResult = assetInputProcessor.handleEntity(validResult)
-
+		def processingResult = processor.handleEntity(validResult)
 
 		then: "make sure that the result is as expected "
 		processingResult.present
@@ -66,15 +82,13 @@ class AssetInputProcessorTest extends Specification {
 	}
 
 
-	def "A AssetInputProcessor should de-serialize a provided ConnectorInput correctly"() {
+	def "A InputEntityProcessor should de-serialize a provided ConnectorInput correctly"() {
 		given:
-		TimeTools.initialize(ZoneId.of("UTC"), Locale.GERMANY, "yyyy-MM-dd HH:mm:ss")
-		def assetInputProcessor = new AssetInputProcessor(modelClass)
+		def processor = new InputEntityProcessor(modelClass)
 		def validInput = modelInstance
 
 		when: "the entity is passed to the processor"
-		def processingResult = assetInputProcessor.handleEntity(validInput)
-
+		def processingResult = processor.handleEntity(validInput)
 
 		then: "make sure that the result is as expected "
 		processingResult.present
@@ -84,7 +98,6 @@ class AssetInputProcessorTest extends Specification {
 				assert (v == expectedResult.get(k))
 		}
 
-
 		where:
 		modelClass         | modelInstance                   || expectedResult
 		Transformer3WInput | GridTestData.transformerAtoBtoC || [
@@ -143,15 +156,13 @@ class AssetInputProcessorTest extends Specification {
 		]
 	}
 
-	def "A AssetInputProcessor should de-serialize a provided SystemParticipantInput correctly"() {
-
+	def "A InputEntityProcessor should de-serialize a provided SystemParticipantInput correctly"() {
 		given:
-		def assetInputProcessor = new AssetInputProcessor(modelClass)
+		def processor = new InputEntityProcessor(modelClass)
 		def validInput = modelInstance
 
 		when: "the entity is passed to the processor"
-		def processingResult = assetInputProcessor.handleEntity(validInput)
-
+		def processingResult = processor.handleEntity(validInput)
 
 		then: "make sure that the result is as expected "
 		processingResult.present
@@ -161,7 +172,6 @@ class AssetInputProcessorTest extends Specification {
 				assert (v == expectedResult.get(k))
 		}
 
-
 		where:
 		modelClass       | modelInstance                              || expectedResult
 		FixedFeedInInput | SystemParticipantTestData.fixedFeedInInput || [
@@ -278,4 +288,370 @@ class AssetInputProcessorTest extends Specification {
 			"type"            : SystemParticipantTestData.hpInput.type.getUuid().toString()
 		]
 	}
+
+	def "The InputEntityProcessor should de-serialize a provided NodeGraphicInput with point correctly"() {
+		given:
+		InputEntityProcessor processor = new InputEntityProcessor(NodeGraphicInput)
+		NodeGraphicInput validNode = GridTestData.nodeGraphicC
+		Map expected = [
+			"uuid"          : "09aec636-791b-45aa-b981-b14edf171c4c",
+			"graphicLayer"  : "main",
+			"path"          : "",
+			"point"         : "{\"type\":\"Point\",\"coordinates\":[0.0,10],\"crs\":{\"type\":\"name\",\"properties\":{\"name\":\"EPSG:4326\"}}}",
+			"node"          : "bd837a25-58f3-44ac-aa90-c6b6e3cd91b2"
+		]
+
+		when:
+		Optional<LinkedHashMap<String, String>> actual = processor.handleEntity(validNode)
+
+		then:
+		actual.present
+		actual.get() == expected
+	}
+
+	def "The InputEntityProcessor should de-serialize a provided NodeGraphicInput with path correctly"() {
+		given:
+		InputEntityProcessor processor = new InputEntityProcessor(NodeGraphicInput)
+		NodeGraphicInput validNode = GridTestData.nodeGraphicD
+		Map expected = [
+			"uuid"          : "9ecad435-bd16-4797-a732-762c09d4af25",
+			"graphicLayer"  : "main",
+			"path"          : "{\"type\":\"LineString\",\"coordinates\":[[-1,0.0],[1,0.0]],\"crs\":{\"type\":\"name\",\"properties\":{\"name\":\"EPSG:4326\"}}}",
+			"point"         : "",
+			"node"          : "6e0980e0-10f2-4e18-862b-eb2b7c90509b"
+		]
+
+		when:
+		Optional<LinkedHashMap<String, String>> actual = processor.handleEntity(validNode)
+
+		then:
+		actual.present
+		actual.get() == expected
+	}
+
+	def "The InputEntityProcessor should de-serialize a provided LineGraphicInput correctly"() {
+		given:
+		InputEntityProcessor processor = new InputEntityProcessor(LineGraphicInput)
+		LineGraphicInput validNode = GridTestData.lineGraphicCtoD
+		Map expected = [
+			"uuid"          : "ece86139-3238-4a35-9361-457ecb4258b0",
+			"graphicLayer"  : "main",
+			"path"          : "{\"type\":\"LineString\",\"coordinates\":[[0.0,0.0],[0.0,10]],\"crs\":{\"type\":\"name\",\"properties\":{\"name\":\"EPSG:4326\"}}}",
+			"line"          : "91ec3bcf-1777-4d38-af67-0bf7c9fa73c7"
+		]
+
+		when:
+		Optional<LinkedHashMap<String, String>> actual = processor.handleEntity(validNode)
+
+		then:
+		actual.present
+		actual.get() == expected
+	}
+
+	def "The InputEntityProcessor should de-serialize a provided OperatorInput correctly"() {
+		given:
+		InputEntityProcessor processor = new InputEntityProcessor(OperatorInput)
+		OperatorInput operator = new OperatorInput(UUID.fromString("420ee39c-dd5a-4d9c-9156-23dbdef13e5e"), "Prof. Brokkoli")
+		Map expected = [
+			"uuid"  : "420ee39c-dd5a-4d9c-9156-23dbdef13e5e",
+			"id"    : "Prof. Brokkoli"
+		]
+
+		when:
+		Optional<LinkedHashMap<String, String>> actual = processor.handleEntity(operator)
+
+		then:
+		actual.present
+		actual.get() == expected
+	}
+
+	def "The InputEntityProcessor should de-serialize a provided RandomLoadParameters correctly"() {
+		given:
+		InputEntityProcessor processor = new InputEntityProcessor(RandomLoadParameters)
+		RandomLoadParameters parameters = new RandomLoadParameters(
+				UUID.fromString("a5b0f432-27b5-4b3e-b87a-61867b9edd79"),
+				4,
+				1.2,
+				2.3,
+				3.4,
+				4.5,
+				5.6,
+				6.7,
+				7.8,
+				8.9,
+				9.10
+				)
+		Map expected = [
+			"uuid"          : "a5b0f432-27b5-4b3e-b87a-61867b9edd79",
+			"quarterHour"   : "4",
+			"kWd"           : "1.2",
+			"kSa"           : "2.3",
+			"kSu"           : "3.4",
+			"myWd"          : "4.5",
+			"mySa"          : "5.6",
+			"mySu"          : "6.7",
+			"sigmaWd"       : "7.8",
+			"sigmaSa"       : "8.9",
+			"sigmaSu"       : "9.1"
+		]
+
+		when:
+		Optional<LinkedHashMap<String, String>> actual = processor.handleEntity(parameters)
+
+		then:
+		actual.present
+		actual.get() == expected
+	}
+
+	def "The InputEntityProcessor should de-serialize a provided WecCharacteristicInput correctly"() {
+		given:
+		InputEntityProcessor processor = new InputEntityProcessor(WecCharacteristicInput)
+		WecCharacteristicInput characteristic = TypeTestData.wecCharacteristic
+		Map expected = [
+			"uuid"              : "ab5ed9e4-62b5-4f40-adf1-286bda97569c",
+			"type"              : "a24fc5b9-a26f-44de-96b8-c9f50b665cb3",
+			"characteristic"    : "{(0.0,0.0), (8.0,0.2), (12.0,0.5), (14.0,1.0), (22.0,0.0)}"
+		]
+
+		when:
+		Optional<Map<String, String>> actual = processor.handleEntity(characteristic)
+
+		then:
+		actual.present
+		actual.get() == expected
+	}
+
+	def "The InputEntityProcessor should de-serialize a provided WecTypeInput correctly"() {
+		given:
+		InputEntityProcessor processor = new InputEntityProcessor(WecTypeInput)
+		WecTypeInput type = TypeTestData.wecType
+		Map expected = [
+			"uuid"          : "a24fc5b9-a26f-44de-96b8-c9f50b665cb3",
+			"id"            : "Test wec type",
+			"capex"         : "100.0",
+			"opex"          : "101.0",
+			"cosphiRated"   : "0.95",
+			"etaConv"       : "90.0",
+			"sRated"        : "2500.0",
+			"rotorArea"     : "2000.0",
+			"hubHeight"     : "130.0"
+		]
+
+		when:
+		Optional<Map<String, String>> actual = processor.handleEntity(type)
+
+		then:
+		actual.present
+		actual.get() == expected
+	}
+
+	def "The InputEntityProcessor should de-serialize a provided Transformer2WTypeInput correctly"() {
+		given:
+		InputEntityProcessor processor = new InputEntityProcessor(Transformer2WTypeInput)
+		Transformer2WTypeInput type = GridTestData.transformerTypeBtoD
+		Map expected = [
+			"uuid"      : "202069a7-bcf8-422c-837c-273575220c8a",
+			"id"        : "HS-MS_1",
+			"rSc"       : "45.375",
+			"xSc"       : "102.759",
+			"gM"        : "0.0",
+			"bM"        : "0.0",
+			"sRated"    : "20000.0",
+			"vRatedA"   : "110.0",
+			"vRatedB"   : "20.0",
+			"dV"        : "1.5",
+			"dPhi"      : "0.0",
+			"tapSide"   : "false",
+			"tapNeutr"  : "0",
+			"tapMax"    : "10",
+			"tapMin"    : "-10"
+		]
+
+		when:
+		Optional<Map<String, String>> actual = processor.handleEntity(type)
+
+		then:
+		actual.present
+		actual.get() == expected
+	}
+
+	def "The InputEntityProcessor should de-serialize a provided Transformer3WTypeInput correctly"() {
+		given:
+		InputEntityProcessor processor = new InputEntityProcessor(Transformer3WTypeInput)
+		Transformer3WTypeInput type = GridTestData.transformerTypeAtoBtoC
+		Map expected = [
+			"uuid"      : "5b0ee546-21fb-4a7f-a801-5dbd3d7bb356",
+			"id"        : "HöS-HS-MS_1",
+			"sRatedA"   : "120000.0",
+			"sRatedB"   : "60000.0",
+			"sRatedC"   : "40000.0",
+			"vRatedA"   : "380.0",
+			"vRatedB"   : "110.0",
+			"vRatedC"   : "20.0",
+			"rScA"      : "0.3",
+			"rScB"      : "0.025",
+			"rScC"      : "8.0E-4",
+			"xScA"      : "1.0",
+			"xScB"      : "0.08",
+			"xScC"      : "0.003",
+			"gM"        : "40000.0",
+			"bM"        : "1000.0",
+			"dV"        : "1.5",
+			"dPhi"      : "0.0",
+			"tapNeutr"  : "0",
+			"tapMin"    : "-10",
+			"tapMax"    : "10"
+		]
+
+		when:
+		Optional<Map<String, String>> actual = processor.handleEntity(type)
+
+		then:
+		actual.present
+		actual.get() == expected
+	}
+
+	def "The InputEntityProcessor should de-serialize a provided LineTypeInput correctly"() {
+		given:
+		InputEntityProcessor processor = new InputEntityProcessor(LineTypeInput)
+		LineTypeInput type = GridTestData.lineTypeInputCtoD
+		Map expected = [
+			"uuid"  : "3bed3eb3-9790-4874-89b5-a5434d408088",
+			"id"    : "lineType_AtoB",
+			"b"     : "0.00322",
+			"g"     : "0.0",
+			"r"     : "0.437",
+			"x"     : "0.356",
+			"iMax"  : "300.0",
+			"vRated": "20.0"
+		]
+
+		when:
+		Optional<Map<String, String>> actual = processor.handleEntity(type)
+
+		then:
+		actual.present
+		actual.get() == expected
+	}
+
+	def "The InputEntityProcessor should de-serialize a provided EvTypeInput correctly"() {
+		given:
+		InputEntityProcessor processor = new InputEntityProcessor(EvTypeInput)
+		EvTypeInput type = TypeTestData.evType
+		Map expected = [
+			"uuid"          : "66b0db5d-b2fb-41d0-a9bc-990d6b6a36db",
+			"id"            : "ev type",
+			"capex"         : "100.0",
+			"opex"          : "101.0",
+			"eStorage"      : "100.0",
+			"eCons"         : "23.0",
+			"sRated"        : "22.0",
+			"cosphiRated"   : "0.9"
+		]
+
+		when:
+		Optional<Map<String, String>> actual = processor.handleEntity(type)
+
+		then:
+		actual.present
+		actual.get() == expected
+	}
+
+	def "The InputEntityProcessor should de-serialize a provided ChpTypeInput correctly"() {
+		given:
+		InputEntityProcessor processor = new InputEntityProcessor(ChpTypeInput)
+		ChpTypeInput type = TypeTestData.chpType
+		Map expected = [
+			"uuid"          : "1c027d3e-5409-4e52-a0e2-f8a23d5d0af0",
+			"id"            : "chp type",
+			"capex"         : "100.0",
+			"opex"          : "101.0",
+			"etaEl"         : "95.0",
+			"etaThermal"    : "90.0",
+			"sRated"        : "58.0",
+			"cosphiRated"   : "0.98",
+			"pThermal"      : "49.59",
+			"pOwn"          : "5.0"
+		]
+
+		when:
+		Optional<Map<String, String>> actual = processor.handleEntity(type)
+
+		then:
+		actual.present
+		actual.get() == expected
+	}
+
+	def "The InputEntityProcessor should de-serialize a provided HpTypeInput correctly"() {
+		given:
+		InputEntityProcessor processor = new InputEntityProcessor(HpTypeInput)
+		HpTypeInput type = TypeTestData.hpType
+		Map expected = [
+			"uuid"          : "1059ef51-9e17-4c13-928c-7c1c716d4ee6",
+			"id"            : "hp type",
+			"capex"         : "100.0",
+			"opex"          : "101.0",
+			"sRated"        : "45.0",
+			"cosphiRated"   : "0.975",
+			"pThermal"      : "26.3"
+		]
+
+		when:
+		Optional<Map<String, String>> actual = processor.handleEntity(type)
+
+		then:
+		actual.present
+		actual.get() == expected
+	}
+
+	def "The InputEntityProcessor should de-serialize a provided BmTypeInput correctly"() {
+		given:
+		InputEntityProcessor processor = new InputEntityProcessor(BmTypeInput)
+		BmTypeInput type = TypeTestData.bmType
+		Map expected = [
+			"uuid"                  : "c3bd30f5-1a62-4a37-86e3-074040d965a4",
+			"id"                    : "bm type",
+			"capex"                 : "100.0",
+			"opex"                  : "101.0",
+			"activePowerGradient"   : "5.0",
+			"sRated"                : "800.0",
+			"cosphiRated"           : "0.965",
+			"etaConv"               : "89.0"
+		]
+
+		when:
+		Optional<Map<String, String>> actual = processor.handleEntity(type)
+
+		then:
+		actual.present
+		actual.get() == expected
+	}
+
+	def "The InputEntityProcessor should de-serialize a provided StorageTypeInput correctly"() {
+		given:
+		InputEntityProcessor processor = new InputEntityProcessor(StorageTypeInput)
+		StorageTypeInput type = TypeTestData.storageType
+		Map expected = [
+			"uuid"                  : "fbee4995-24dd-45e4-9c85-7d986fe99ff3",
+			"id"                    : "storage type",
+			"capex"                 : "100.0",
+			"opex"                  : "101.0",
+			"eStorage"              : "200.0",
+			"sRated"                : "13.0",
+			"cosphiRated"           : "0.997",
+			"pMax"                  : "12.961",
+			"activePowerGradient"   : "3.0",
+			"eta"                   : "92.0",
+			"dod"                   : "20.0",
+			"lifeTime"              : "43800.0",
+			"lifeCycle"             : "100000"
+		]
+
+		when:
+		Optional<Map<String, String>> actual = processor.handleEntity(type)
+
+		then:
+		actual.present
+		actual.get() == expected
+	}
 }
diff --git a/src/test/groovy/edu/ie3/test/common/GridTestData.groovy b/src/test/groovy/edu/ie3/test/common/GridTestData.groovy
index 5e6a00341..ee57c2d2d 100644
--- a/src/test/groovy/edu/ie3/test/common/GridTestData.groovy
+++ b/src/test/groovy/edu/ie3/test/common/GridTestData.groovy
@@ -44,8 +44,8 @@ class GridTestData {
 
 	private static final GeoJsonReader geoJsonReader = new GeoJsonReader()
 
-	private static final Transformer2WTypeInput transformerTypeBtoD = new Transformer2WTypeInput(
-	UUID.randomUUID(),
+	public static final Transformer2WTypeInput transformerTypeBtoD = new Transformer2WTypeInput(
+	UUID.fromString("202069a7-bcf8-422c-837c-273575220c8a"),
 	"HS-MS_1",
 	Quantities.getQuantity(45.375, OHM),
 	Quantities.getQuantity(102.759, OHM),
@@ -113,7 +113,7 @@ class GridTestData {
 	10
 	)
 
-	private static final Transformer3WTypeInput transformerTypeAtoBtoC = new Transformer3WTypeInput(
+	public static final Transformer3WTypeInput transformerTypeAtoBtoC = new Transformer3WTypeInput(
 	UUID.fromString("5b0ee546-21fb-4a7f-a801-5dbd3d7bb356"),
 	"HöS-HS-MS_1",
 	Quantities.getQuantity(120000d, KILOVOLTAMPERE),
@@ -308,7 +308,7 @@ class GridTestData {
 	true
 	)
 
-	private static final LineTypeInput lineTypeInputCtoD = new LineTypeInput(
+	public static final LineTypeInput lineTypeInputCtoD = new LineTypeInput(
 	UUID.fromString("3bed3eb3-9790-4874-89b5-a5434d408088"),
 	"lineType_AtoB",
 	Quantities.getQuantity(0.00000000322, PowerSystemUnits.SIEMENS_PER_KILOMETRE),
diff --git a/src/test/groovy/edu/ie3/test/common/TypeTestData.groovy b/src/test/groovy/edu/ie3/test/common/TypeTestData.groovy
new file mode 100644
index 000000000..d954adfb7
--- /dev/null
+++ b/src/test/groovy/edu/ie3/test/common/TypeTestData.groovy
@@ -0,0 +1,111 @@
+/*
+ * © 2020. TU Dortmund University,
+ * Institute of Energy Systems, Energy Efficiency and Energy Economics,
+ * Research group Distribution grid planning and operation
+ */
+package edu.ie3.test.common
+
+import static edu.ie3.util.quantities.PowerSystemUnits.EURO
+import static edu.ie3.util.quantities.PowerSystemUnits.KILOVOLTAMPERE
+import static edu.ie3.util.quantities.PowerSystemUnits.KILOWATT
+import static edu.ie3.util.quantities.PowerSystemUnits.KILOWATTHOUR
+import static edu.ie3.util.quantities.PowerSystemUnits.KILOWATTHOUR_PER_KILOMETRE
+import static edu.ie3.util.quantities.PowerSystemUnits.PU
+import static edu.ie3.util.quantities.PowerSystemUnits.EURO_PER_MEGAWATTHOUR
+import static edu.ie3.util.quantities.PowerSystemUnits.MEGAVOLTAMPERE
+import static edu.ie3.util.quantities.PowerSystemUnits.PU_PER_HOUR
+import static tec.uom.se.unit.Units.HOUR
+import static tec.uom.se.unit.Units.PERCENT
+import static tec.uom.se.unit.Units.SQUARE_METRE
+import static tec.uom.se.unit.Units.METRE
+
+import edu.ie3.datamodel.models.input.system.characteristic.WecCharacteristicInput
+import edu.ie3.datamodel.models.input.system.type.BmTypeInput
+import edu.ie3.datamodel.models.input.system.type.ChpTypeInput
+import edu.ie3.datamodel.models.input.system.type.EvTypeInput
+import edu.ie3.datamodel.models.input.system.type.HpTypeInput
+import edu.ie3.datamodel.models.input.system.type.StorageTypeInput
+
+import edu.ie3.datamodel.models.input.system.type.WecTypeInput
+import tec.uom.se.quantity.Quantities
+
+class TypeTestData extends GridTestData {
+	public static final BmTypeInput bmType = new BmTypeInput(
+	UUID.fromString("c3bd30f5-1a62-4a37-86e3-074040d965a4"),
+	"bm type",
+	Quantities.getQuantity(100d, EURO),
+	Quantities.getQuantity(101d, EURO_PER_MEGAWATTHOUR),
+	Quantities.getQuantity(0.05, PU_PER_HOUR),
+	Quantities.getQuantity(800d, KILOVOLTAMPERE),
+	0.965,
+	Quantities.getQuantity(0.89, PU)
+	)
+
+	public static final ChpTypeInput chpType = new ChpTypeInput(
+	UUID.fromString("1c027d3e-5409-4e52-a0e2-f8a23d5d0af0"),
+	"chp type",
+	Quantities.getQuantity(100d, EURO),
+	Quantities.getQuantity(101d, EURO_PER_MEGAWATTHOUR),
+	Quantities.getQuantity(0.95, PU),
+	Quantities.getQuantity(0.9, PU),
+	Quantities.getQuantity(58d, KILOVOLTAMPERE),
+	0.98,
+	Quantities.getQuantity(49.59, KILOWATT),
+	Quantities.getQuantity(5d, KILOWATT)
+	)
+
+	public static final EvTypeInput evType = new EvTypeInput(
+	UUID.fromString("66b0db5d-b2fb-41d0-a9bc-990d6b6a36db"),
+	"ev type",
+	Quantities.getQuantity(100d, EURO),
+	Quantities.getQuantity(101d, EURO_PER_MEGAWATTHOUR),
+	Quantities.getQuantity(100d, KILOWATTHOUR),
+	Quantities.getQuantity(23d, KILOWATTHOUR_PER_KILOMETRE),
+	Quantities.getQuantity(22d, KILOWATT),
+	0.9
+	)
+
+	public static final HpTypeInput hpType = new HpTypeInput(
+	UUID.fromString("1059ef51-9e17-4c13-928c-7c1c716d4ee6"),
+	"hp type",
+	Quantities.getQuantity(100d, EURO),
+	Quantities.getQuantity(101d, EURO_PER_MEGAWATTHOUR),
+	Quantities.getQuantity(45d, KILOWATT),
+	0.975,
+	Quantities.getQuantity(26.3, KILOWATT)
+	)
+
+	public static final StorageTypeInput storageType = new StorageTypeInput(
+	UUID.fromString("fbee4995-24dd-45e4-9c85-7d986fe99ff3"),
+	"storage type",
+	Quantities.getQuantity(100d, EURO),
+	Quantities.getQuantity(101d, EURO_PER_MEGAWATTHOUR),
+	Quantities.getQuantity(200d, KILOWATTHOUR),
+	Quantities.getQuantity(13d, KILOVOLTAMPERE),
+	0.997,
+	Quantities.getQuantity(12.961, KILOWATT),
+	Quantities.getQuantity(0.03, PU_PER_HOUR),
+	Quantities.getQuantity(0.92, PU),
+	Quantities.getQuantity(20d, PERCENT),
+	Quantities.getQuantity(43800.0, HOUR),
+	100000
+	)
+
+	public static final WecTypeInput wecType = new WecTypeInput(
+	UUID.fromString("a24fc5b9-a26f-44de-96b8-c9f50b665cb3"),
+	"Test wec type",
+	Quantities.getQuantity(100d, EURO),
+	Quantities.getQuantity(101d, EURO_PER_MEGAWATTHOUR),
+	0.95,
+	Quantities.getQuantity(0.9, PU),
+	Quantities.getQuantity(2.5d, MEGAVOLTAMPERE),
+	Quantities.getQuantity(2000d, SQUARE_METRE),
+	Quantities.getQuantity(130d, METRE)
+	)
+
+	public static final WecCharacteristicInput wecCharacteristic = new WecCharacteristicInput(
+	UUID.fromString("ab5ed9e4-62b5-4f40-adf1-286bda97569c"),
+	wecType,
+	"{(0.0,0.0), (8.0,0.2), (12.0,0.5), (14.0,1.0), (22.0,0.0)}"
+	)
+}
\ No newline at end of file