You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2023/05/29 14:37:08 UTC

[streampipes] branch 1632-cleanup-data-processor-and-sink-api created (now 88cd7e970)

This is an automated email from the ASF dual-hosted git repository.

riemer pushed a change to branch 1632-cleanup-data-processor-and-sink-api
in repository https://gitbox.apache.org/repos/asf/streampipes.git


      at 88cd7e970 Refactor data processor and sink API (#1632)

This branch includes the following new commits:

     new 88cd7e970 Refactor data processor and sink API (#1632)

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[streampipes] 01/01: Refactor data processor and sink API (#1632)

Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

riemer pushed a commit to branch 1632-cleanup-data-processor-and-sink-api
in repository https://gitbox.apache.org/repos/asf/streampipes.git

commit 88cd7e97039cec1e50181c5c010a247c93452a29
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Mon May 29 16:36:38 2023 +0200

    Refactor data processor and sink API (#1632)
---
 pom.xml                                            |  19 +--
 .../apache/streampipes/commons/constants/Envs.java |  10 +-
 .../commons/environment/DefaultEnvironment.java    |  15 +++
 .../commons/environment/Environment.java           |   7 +
 .../dataexplorer/commons/DataExplorerUtils.java    |  10 +-
 .../dataexplorer/commons/TimeSeriesStore.java      |   4 +-
 streampipes-extensions-api/pom.xml                 |   5 +
 .../api/extractor/IDataSinkParameterExtractor.java |   8 +-
 .../api/pe/IStreamPipesDataProcessor.java          |  29 ++--
 .../extensions/api/pe/IStreamPipesDataSink.java    |  20 +--
 .../IStreamPipesDataStream.java}                   |   7 +-
 .../IStreamPipesPipelineElement.java}              |  10 +-
 .../api/pe/config/IDataProcessorConfiguration.java |  16 ++-
 .../config/IDataSinkConfiguration.java}            |   8 +-
 .../config/IDataStreamConfiguration.java}          |   9 +-
 .../config/IPipelineElementConfiguration.java}     |  15 ++-
 .../pe/context/EventProcessorRuntimeContext.java   |   7 +-
 .../api/pe}/context/EventSinkRuntimeContext.java   |   2 +-
 .../context/IContextGenerator.java}                |  11 +-
 .../extensions/api/pe}/context/RuntimeContext.java |  18 +--
 .../api/pe/param/IDataProcessorParameters.java     |  26 ++--
 .../param/IDataSinkParameters.java}                |   8 +-
 .../api/pe/param/IInternalRuntimeParameters.java   |  14 +-
 .../api/pe/param/IParameterGenerator.java          |  13 +-
 .../api/pe/param/IPipelineElementParameters.java   |  48 ++++---
 .../api/pe/param}/InputStreamParams.java           |  17 +--
 .../api/pe/param}/OutputStreamParams.java          |   6 +-
 .../api/pe}/routing/PipelineElementCollector.java  |   2 +-
 .../api/pe}/routing/RawDataProcessor.java          |   2 +-
 .../api/pe}/routing/SpInputCollector.java          |   2 +-
 .../api/pe}/routing/SpOutputCollector.java         |   2 +-
 .../runtime/IDataProcessorRuntime.java}            |   7 +-
 .../runtime/IDataSinkRuntime.java}                 |   7 +-
 .../runtime/IStreamPipesRuntime.java}              |  15 ++-
 .../runtime/IStreamPipesRuntimeProvider.java}      |   9 +-
 .../context/AdapterContextGenerator.java           |  14 +-
 .../management/init/DeclarersSingleton.java        | 110 ++++++++-------
 .../management/init/RunningInstances.java          |  15 ++-
 .../management/model/SpServiceDefinition.java      |  34 +++--
 .../model/SpServiceDefinitionBuilder.java          |  14 +-
 .../management/util/RuntimeContextUtils.java       |  17 +--
 .../management/util/ServiceDefinitionUtil.java     |   9 +-
 .../connectors/influx/sink/InfluxDbSink.java       |   6 +-
 .../streampipes-extensions-all-jvm/pom.xml         |   7 +
 .../extensions/all/jvm/AllExtensionsInit.java      |   2 +
 .../pom.xml                                        |   2 +-
 .../flink/AbstractAggregationProgram.java          |  49 -------
 .../aggregation/AggregationController.java         |  12 +-
 .../aggregation/AggregationParameters.java         |   4 +-
 .../processor/aggregation/AggregationProgram.java  |  47 +++----
 .../flink/processor/count/CountController.java     |  12 +-
 .../flink/processor/count/CountParameters.java     |   6 +-
 .../flink/processor/count/CountProgram.java        |  21 ++-
 .../processor/eventcount/EventCountController.java |  12 +-
 .../processor/eventcount/EventCountParameters.java |   4 +-
 .../processor/eventcount/EventCountProgram.java    |  18 +--
 .../flink/processor/rate/EventRate.java            |   2 +-
 .../flink/processor/rate/EventRateController.java  |  12 +-
 .../flink/processor/rate/EventRateParameter.java   |   4 +-
 .../flink/processor/rate/EventRateProgram.java     |  16 +--
 .../jvm/welford/WelfordChangeDetection.java        |   6 +-
 .../enricher/flink/AbstractEnricherProgram.java    |  49 -------
 .../enricher/flink/EnricherFlinkInit.java          |   5 +-
 .../processor/timestamp/TimestampController.java   |  12 +-
 .../processor/timestamp/TimestampParameters.java   |   4 +-
 .../processor/timestamp/TimestampProgram.java      |  15 +--
 .../UrlDereferencingController.java                |  23 +---
 .../UrlDereferencingParameter.java                 |   4 +-
 .../urldereferencing/UrlDereferencingProgram.java  |  14 +-
 .../jvm/processor/jseval/JSEvalProcessor.java      |   6 +-
 .../jvm/processor/math/MathOpProcessor.java        |   6 +-
 .../math/staticmathop/StaticMathOpProcessor.java   |   6 +-
 .../sizemeasure/SizeMeasureProcessor.java          |   6 +-
 .../trigonometry/TrigonometryProcessor.java        |   6 +-
 .../valuechange/ValueChangeProcessor.java          |   6 +-
 .../booleanfilter/BooleanFilterProcessor.java      |   6 +-
 .../jvm/processor/compose/ComposeProcessor.java    |   6 +-
 .../processor/enrich/MergeByEnrichProcessor.java   |   6 +-
 .../jvm/processor/limit/RateLimitProcessor.java    |   6 +-
 .../jvm/processor/limit/util/WindowFactory.java    |   2 +-
 .../jvm/processor/limit/window/CronWindow.java     |   2 +-
 .../jvm/processor/limit/window/LengthWindow.java   |   2 +-
 .../jvm/processor/limit/window/ScheduleWindow.java |   2 +-
 .../jvm/processor/limit/window/TimeWindow.java     |   2 +-
 .../jvm/processor/merge/MergeByTimeProcessor.java  |   6 +-
 .../movingaverage/MovingAverageProcessor.java      |   8 +-
 .../numericalfilter/NumericalFilterProcessor.java  |   6 +-
 .../NumericalTextFilterProcessor.java              |   6 +-
 .../processor/projection/ProjectionProcessor.java  |   6 +-
 .../processor/schema/MergeBySchemaProcessor.java   |   6 +-
 .../processor/sdt/SwingingDoorTrendingFilter.java  |   2 +-
 .../sdt/SwingingDoorTrendingFilterProcessor.java   |   6 +-
 .../processor/textfilter/TextFilterProcessor.java  |   8 +-
 .../threshold/ThresholdDetectionProcessor.java     |   6 +-
 .../throughputmon/ThroughputMonitorProcessor.java  |   6 +-
 .../processors/siddhi/count/CountAggregation.java  |   3 +-
 .../filter/NumericalFilterSiddhiProcessor.java     |   3 +-
 .../siddhi/frequency/FrequencySiddhiProcessor.java |   5 +-
 .../FrequencyChangeSiddhiProcessor.java            |   7 +-
 .../siddhi/listcollector/ListCollector.java        |   3 +-
 .../processors/siddhi/listfilter/ListFilter.java   |   7 +-
 .../siddhi/sequence/SequenceSiddhiProcessor.java   |   7 +-
 .../siddhi/stop/StreamStopSiddhiProcessor.java     |   7 +-
 .../streampipes/processors/siddhi/topk/TopK.java   |   7 +-
 .../processors/siddhi/trend/TrendProcessor.java    |   7 +-
 .../siddhi/trend/TestTrendProcessor.java           |   6 +-
 .../processor/geo/flink/AbstractGeoProgram.java    |  47 -------
 .../SpatialGridEnrichmentController.java           |  12 +-
 .../SpatialGridEnrichmentParameters.java           |   4 +-
 .../gridenricher/SpatialGridEnrichmentProgram.java |  14 +-
 .../buffergeometry/BufferGeomProcessor.java        |   6 +-
 .../bufferpoint/BufferPointProcessor.java          |   6 +-
 .../geo/jvm/jts/processor/epsg/EpsgProcessor.java  |   6 +-
 .../LatLngToJtsPointProcessor.java                 |   6 +-
 .../reprojection/ReprojectionProcessor.java        |   6 +-
 .../trajectory/TrajectoryFromPointsProcessor.java  |   6 +-
 .../complex/TopologyValidationProcessor.java       |   6 +-
 .../simple/GeometryValidationProcessor.java        |   6 +-
 .../HaversineDistanceCalculatorProcessor.java      |   6 +-
 ...HaversineStaticDistanceCalculatorProcessor.java |   6 +-
 .../googlemaps/GoogleMapsGeocoderProcessor.java    |   6 +-
 .../GoogleMapsStaticGeocoderProcessor.java         |   6 +-
 .../geocityname/GeoCityNameRevdecodeProcessor.java |   6 +-
 .../speedcalculator/SpeedCalculatorProcessor.java  |   6 +-
 .../GenericImageClassificationProcessor.java       |   6 +-
 .../imagecropper/ImageCropperProcessor.java        |   6 +-
 .../imageenrichment/ImageEnrichmentProcessor.java  |   6 +-
 .../processor/qrreader/QrCodeReaderProcessor.java  |   6 +-
 .../pom.xml                                        |   4 +-
 .../flink/AbstractPatternDetectionProgram.java     |  30 +----
 .../flink/processor/absence/AbsenceController.java |  12 +-
 .../flink/processor/absence/AbsenceParameters.java |   4 +-
 .../flink/processor/absence/AbsenceProgram.java    |  12 +-
 .../flink/processor/and/AndController.java         |  12 +-
 .../flink/processor/and/AndParameters.java         |   4 +-
 .../detection/flink/processor/and/AndProgram.java  |   8 +-
 .../processor/peak/PeakDetectionController.java    |  12 +-
 .../processor/peak/PeakDetectionParameters.java    |   4 +-
 .../flink/processor/peak/PeakDetectionProgram.java |  10 +-
 .../processor/sequence/SequenceController.java     |  12 +-
 .../processor/sequence/SequenceParameters.java     |   4 +-
 .../flink/processor/sequence/SequenceProgram.java  |  17 +--
 .../flink/AbstractStatisticsProgram.java           |  49 -------
 .../stat/summary/StatisticsSummaryController.java  |  12 +-
 .../stat/summary/StatisticsSummaryParameters.java  |   4 +-
 .../stat/summary/StatisticsSummaryProgram.java     |  16 +--
 .../window/StatisticsSummaryControllerWindow.java  |  12 +-
 .../window/StatisticsSummaryParametersWindow.java  |   4 +-
 .../window/StatisticsSummaryProgramWindow.java     |  17 +--
 .../pom.xml                                        |   2 +-
 .../flink/AbstractTextMiningProgram.java           |  49 -------
 .../language/LanguageDetectionController.java      |  13 +-
 .../language/LanguageDetectionParameters.java      |   4 +-
 .../language/LanguageDetectionProgram.java         |  14 +-
 .../processor/sentiment/SentimentDetection.java    |  21 ---
 .../sentiment/SentimentDetectionController.java    |  21 ---
 .../sentiment/SentimentDetectionProgram.java       |  21 ---
 .../processor/wordcount/WordCountController.java   |  13 +-
 .../processor/wordcount/WordCountParameters.java   |   4 +-
 .../processor/wordcount/WordCountProgram.java      |  16 +--
 .../jvm/processor/chunker/ChunkerProcessor.java    |   6 +-
 .../language/LanguageDetectionProcessor.java       |   6 +-
 .../processor/namefinder/NameFinderProcessor.java  |   6 +-
 .../partofspeech/PartOfSpeechProcessor.java        |   6 +-
 .../SentenceDetectionProcessor.java                |   6 +-
 .../processor/tokenizer/TokenizerProcessor.java    |   6 +-
 .../flink/AbstractFlinkTransformationProgram.java  |  32 +----
 .../flink/TransformationFlinkInit.java             |   4 -
 .../boilerplate/BoilerplateController.java         |  12 +-
 .../boilerplate/BoilerplateParameters.java         |   4 +-
 .../processor/boilerplate/BoilerplateProgram.java  |  10 +-
 .../converter/FieldConverterController.java        |  12 +-
 .../converter/FieldConverterParameters.java        |   4 +-
 .../processor/converter/FieldConverterProgram.java |  10 +-
 .../flink/processor/hasher/FieldHasher.java        |  46 -------
 .../processor/hasher/FieldHasherController.java    |  74 -----------
 .../processor/hasher/FieldHasherParameters.java    |  45 -------
 .../flink/processor/hasher/FieldHasherProgram.java |  46 -------
 .../hasher/algorithm/HashAlgorithmType.java        |  33 -----
 .../hasher/algorithm/Sha2HashAlgorithm.java        |  32 -----
 .../flink/processor/mapper/FieldMapper.java        |  56 --------
 .../processor/mapper/FieldMapperController.java    |  93 -------------
 .../processor/mapper/FieldMapperParameters.java    |  43 ------
 .../flink/processor/mapper/FieldMapperProgram.java |  40 ------
 .../MeasurementUnitConverterController.java        |  12 +-
 .../MeasurementUnitConverterParameters.java        |   4 +-
 .../MeasurementUnitConverterProgram.java           |  10 +-
 .../processor/rename/FieldRenamerController.java   |  12 +-
 .../processor/rename/FieldRenamerParameters.java   |   4 +-
 .../processor/rename/FieldRenamerProgram.java      |  10 +-
 .../processor/array/count/CountArrayProcessor.java |   6 +-
 .../processor/array/split/SplitArrayProcessor.java |   6 +-
 .../counter/BooleanCounterProcessor.java           |   8 +-
 .../edge/SignalEdgeFilterProcessor.java            |   6 +-
 .../inverter/BooleanInverterProcessor.java         |   8 +-
 .../logical/BooleanOperatorProcessor.java          |   6 +-
 .../state/BooleanToStateProcessor.java             |   6 +-
 .../timekeeping/BooleanTimekeepingProcessor.java   |   6 +-
 .../booloperator/timer/BooleanTimerProcessor.java  |   6 +-
 .../CsvMetadataEnrichmentProcessor.java            |   6 +-
 .../fieldrename/FiledRenameProcessor.java          |   6 +-
 .../jvm/processor/hasher/FieldHasherProcessor.java |   6 +-
 .../jvm/processor/mapper/FieldMapperProcessor.java |   6 +-
 .../MeasurementUnitConverterProcessor.java         |   6 +-
 .../state/buffer/StateBufferProcessor.java         |   6 +-
 .../buffer/StateBufferLabelerProcessor.java        |   6 +-
 .../labeler/number/NumberLabelerProcessor.java     |   6 +-
 .../counter/StringCounterProcessor.java            |   6 +-
 .../state/StringToStateProcessor.java              |   6 +-
 .../stringoperator/timer/StringTimerProcessor.java |   6 +-
 .../jvm/processor/task/TaskDurationProcessor.java  |   6 +-
 .../TimestampExtractorProcessor.java               |   6 +-
 .../TransformToBooleanProcessor.java               |   6 +-
 .../change/ChangedValueDetectionProcessor.java     |   6 +-
 .../value/duration/CalculateDurationProcessor.java |   6 +-
 .../counter/TestBooleanCounterProcessor.java       |   6 +-
 .../inverter/TestBooleanInverterProcessor.java     |   6 +-
 .../counter/TestStringCounterProcessor.java        |   6 +-
 .../state/TestStringToStateProcessor.java          |   4 +-
 .../timer/TestStringTimerProcessor.java            |   4 +-
 .../jvm/bufferrest/BufferRestPublisherSink.java    |   4 +-
 .../sinks/brokers/jvm/jms/JmsPublisherSink.java    |   4 +-
 .../sinks/brokers/jvm/kafka/KafkaParameters.java   |   5 +-
 .../sinks/brokers/jvm/kafka/KafkaPublishSink.java  |   4 +-
 .../sinks/brokers/jvm/mqtt/MqttClient.java         |   2 +-
 .../sinks/brokers/jvm/mqtt/MqttPublisherSink.java  |   4 +-
 .../sinks/brokers/jvm/mqtt/common/MqttOptions.java |   7 +-
 .../sinks/brokers/jvm/nats/NatsController.java     |   6 +-
 .../sinks/brokers/jvm/pulsar/PulsarParameters.java |   5 +-
 .../brokers/jvm/pulsar/PulsarPublisherSink.java    |   4 +-
 .../jvm/rabbitmq/RabbitMqPublisherSink.java        |   4 +-
 .../sinks/brokers/jvm/rest/RestSink.java           |   4 +-
 .../brokers/jvm/rocketmq/RocketMQParameters.java   |   5 +-
 .../jvm/rocketmq/RocketMQPublisherSink.java        |   4 +-
 .../sinks/brokers/jvm/tubemq/TubeMQParameters.java |   5 +-
 .../brokers/jvm/tubemq/TubeMQPublisherSink.java    |   4 +-
 .../brokers/jvm/websocket/WebsocketServerSink.java |   4 +-
 .../brokers/jvm/pulsar/TestPulsarParameters.java   |   2 +-
 .../jvm/pulsar/TestPulsarPublisherSink.java        |   2 +-
 .../jvm/rocketmq/TestRocketMQPublisherSink.java    |   2 +-
 .../elasticsearch/ElasticSearchController.java     |  22 ++-
 .../elasticsearch/ElasticSearchParameters.java     |   4 +-
 .../flink/elasticsearch/ElasticSearchProgram.java  |  34 ++---
 .../sinks/databases/jvm/couchdb/CouchDbSink.java   |   4 +-
 .../sinks/databases/jvm/ditto/DittoSink.java       |   4 +-
 .../sinks/databases/jvm/iotdb/IotDbSink.java       |   4 +-
 .../jdbcclient/model/JdbcConnectionParameters.java |  11 +-
 .../sinks/databases/jvm/opcua/OpcUaSink.java       |   4 +-
 .../databases/jvm/postgresql/PostgreSqlSink.java   |   7 +-
 .../sinks/databases/jvm/redis/RedisSink.java       |   7 +-
 .../sinks/internal/jvm/datalake/DataLakeSink.java  |   6 +-
 .../jvm/notification/NotificationProducer.java     |  12 +-
 .../sinks/notifications/jvm/email/EmailSink.java   |   8 +-
 .../notifications/jvm/onesignal/OneSignalSink.java |   4 +-
 .../jvm/slack/SlackNotificationSink.java           |   4 +-
 .../notifications/jvm/telegram/TelegramSink.java   |   4 +-
 .../watertank/streams/FlowRate2Stream.java         |   1 -
 .../AbstractPipelineElementResource.java           |  12 +-
 .../extensions/html/page/WelcomePageGenerator.java |  52 +++-----
 .../pe/DataProcessorPipelineElementResource.java   |  27 +++-
 .../pe/DataSinkPipelineElementResource.java        |  26 +++-
 .../pe/DataStreamPipelineElementResource.java      |   8 +-
 .../pe/InvocablePipelineElementResource.java       |  70 +++++-----
 .../extensions/pe/PipelineTemplateResource.java    |  35 -----
 .../processor/DataProcessorConfiguration.java      |  52 ++++++++
 .../sdk/builder/sink/DataSinkConfiguration.java    |  52 ++++++++
 .../builder/stream/DataStreamConfiguration.java    |  52 ++++++++
 .../sdk/extractor/DataSinkParameterExtractor.java  |   7 +-
 .../extensions/ExtensionsResourceConfig.java       |   2 -
 .../service/extensions/ServiceTagProvider.java     |   5 +-
 .../function/StreamPipesFunctionHandler.java       |  14 +-
 .../sources/AbstractAdapterIncludedStream.java     |  17 ++-
 .../sources/AbstractAlreadyExistingStream.java     |  25 +++-
 .../distributed/runtime/DistributedRuntime.java    |  55 +++-----
 streampipes-wrapper-flink/pom.xml                  |  13 +-
 .../flink/FlinkDataProcessorCompatProgram.java     |  76 +++++++++++
 .../wrapper/flink/FlinkDataProcessorDeclarer.java  |  46 ++++++-
 ...eclarer.java => FlinkDataProcessorProgram.java} |  11 +-
 .../wrapper/flink/FlinkDataProcessorRuntime.java   |  92 +++++++------
 .../wrapper/flink/FlinkDataSinkCompatProgram.java  |  20 ++-
 .../wrapper/flink/FlinkDataSinkDeclarer.java       |  43 +++++-
 ...SinkDeclarer.java => FlinkDataSinkProgram.java} |  11 +-
 .../wrapper/flink/FlinkDataSinkRuntime.java        |  55 +++++---
 .../streampipes/wrapper/flink/FlinkRuntime.java    | 138 +++++++++++--------
 .../wrapper/flink/FlinkRuntimeProvider.java        |  20 +--
 .../wrapper/flink/IDataProcessorProgram.java       |  10 +-
 .../wrapper/flink/IDataSinkProgram.java            |  10 +-
 ...taProcessorDeclarer.java => IFlinkProgram.java} |  19 ++-
 .../flink/converter/MapToEventConverter.java       |  15 ++-
 ...clarer.java => KafkaStreamRuntimeProvider.java} |  19 ++-
 .../kafka/KafkaStreamsDataProcessorRuntime.java    |  75 ++++++++---
 .../kafka/KafkaStreamsDataSinkDeclarer.java        |  25 ----
 .../wrapper/kafka/KafkaStreamsDataSinkRuntime.java |  28 ++--
 .../wrapper/kafka/KafkaStreamsOutputCollector.java |  73 ++++++++++
 .../wrapper/kafka/KafkaStreamsRuntime.java         |  78 +++++++----
 .../wrapper/kafka/converter/MapToJsonFormat.java   |  45 -------
 .../wrapper/siddhi/engine/SiddhiEngine.java        |  13 +-
 .../wrapper/siddhi/engine/SiddhiEventEngine.java   |  68 ----------
 .../siddhi/engine/SiddhiStatementGenerator.java    |   6 +-
 .../siddhi/engine/StreamPipesSiddhiProcessor.java  |  36 +++--
 .../callback/SiddhiOutputStreamCallback.java       |  18 +--
 .../engine/generator/EventTypeGenerator.java       |   8 +-
 .../engine/generator/InputStreamNameGenerator.java |   8 +-
 .../engine/generator/SiddhiAppGenerator.java       |   9 +-
 .../generator/SiddhiInvocationConfigGenerator.java |  22 +--
 .../siddhi/model/SiddhiProcessorParams.java        |  10 +-
 .../wrapper/siddhi/utils/SiddhiUtils.java          |   8 +-
 .../ConfiguredExternalEventProcessor.java          |  33 -----
 .../standalone/ConfiguredExternalEventSink.java    |  32 -----
 .../wrapper/standalone/ProcessorParams.java        |  36 -----
 .../streampipes/wrapper/standalone/SinkParams.java |  36 -----
 .../standalone/StreamPipesDataProcessor.java       |  64 +++++++--
 .../wrapper/standalone/StreamPipesDataSink.java    |  42 ++++--
 .../StreamPipesExternalDataProcessor.java          | 148 ---------------------
 .../StandaloneEventProcessingDeclarer.java         |  55 --------
 .../StandaloneEventProcessorDeclarerSingleton.java |  60 ---------
 .../declarer/StandaloneEventSinkDeclarer.java      |  55 --------
 .../StandaloneEventSinkDeclarerSingleton.java      |  54 --------
 .../StandaloneExternalEventProcessingDeclarer.java |  55 --------
 .../StandaloneExternalEventSinkDeclarer.java       |  61 ---------
 .../standalone/function/FunctionContext.java       |   2 +-
 .../function/FunctionContextGenerator.java         |   2 +-
 .../standalone/function/StreamPipesFunction.java   |   6 +-
 .../standalone/routing/StandaloneSpCollector.java  |   2 +-
 .../routing/StandaloneSpInputCollector.java        |   4 +-
 .../routing/StandaloneSpOutputCollector.java       |   2 +-
 .../runtime/StandaloneEventProcessorRuntime.java   |  89 ++++++-------
 .../runtime/StandaloneEventSinkRuntime.java        |  81 ++++++-----
 .../StandaloneExternalEventProcessorRuntime.java   |  69 ----------
 .../StandaloneExternalEventSinkRuntime.java        |  69 ----------
 .../runtime/StandalonePipelineElementRuntime.java  | 115 ++++++++++------
 .../StandaloneStreamPipesRuntimeProvider.java}     |  22 +--
 .../context/SpEventProcessorRuntimeContext.java    |  26 +---
 .../wrapper/context/SpEventSinkRuntimeContext.java |  10 +-
 .../wrapper/context/SpRuntimeContext.java          |  24 +---
 .../generator/DataProcessorContextGenerator.java   |  39 ++++++
 .../generator/DataSinkContextGenerator.java}       |  30 ++---
 .../wrapper/declarer/EventProcessorDeclarer.java   |  48 -------
 .../wrapper/declarer/EventSinkDeclarer.java        |  43 ------
 .../wrapper/declarer/PipelineElementDeclarer.java  |  75 -----------
 .../wrapper/params/DataProcessorParameters.java    |  95 +++++++++++++
 ...kBindingParams.java => DataSinkParameters.java} |  30 +++--
 .../InternalRuntimeParameters.java}                |  21 ++-
 .../wrapper/params/PipelineElementParameters.java  | 115 ++++++++++++++++
 .../wrapper/params/binding/BindingParams.java      |  72 ----------
 .../binding/EventProcessorBindingParams.java       |  75 -----------
 .../wrapper/params/compat/ProcessorParams.java     | 114 ++++++++++++++++
 .../wrapper/params/compat/SinkParams.java          |  90 +++++++++++++
 .../generator/DataProcessorParameterGenerator.java |  55 ++++++++
 .../generator/DataSinkParameterGenerator.java      |  51 +++++++
 .../PipelineElementParameterGenerator.java         |  58 ++++++++
 .../runtime/EventProcessorRuntimeParams.java       |  54 --------
 .../wrapper/params/runtime/RuntimeParams.java      | 112 ----------------
 .../wrapper/runtime/EventProcessor.java            |  38 ------
 .../wrapper/runtime/ExternalEventProcessor.java    |  31 -----
 .../wrapper/runtime/ExternalEventSink.java         |  30 -----
 .../wrapper/runtime/PipelineElementRuntime.java    |  63 +++++++--
 357 files changed, 2965 insertions(+), 4161 deletions(-)

diff --git a/pom.xml b/pom.xml
index ff5b110e7..6bfce876a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
 	<consul-client.version>1.5.2</consul-client.version>
 	<elasticsearch.version>6.8.17</elasticsearch.version>
 	<file-management.version>3.1.0</file-management.version>
-	<flink.version>1.13.5</flink.version>
+	<flink.version>1.17.1</flink.version>
 	<fogsy-qudt.version>1.0</fogsy-qudt.version>
 	<fst.version>2.57</fst.version>
 	<geojson-jackson.version>1.14</geojson-jackson.version>
@@ -160,6 +160,7 @@
 	<jsrosbridge.version>0.2.0</jsrosbridge.version>
 	<jedis.version>4.3.1</jedis.version>
 	<j2objc-annotations.version>1.3</j2objc-annotations.version>
+	<kryo.version>2.24.0</kryo.version>
 	<language-detector.version>0.6</language-detector.version>
 	<log4j-to-slf4j.version>2.8.2</log4j-to-slf4j.version>
 	<lombok.version>1.18.22</lombok.version>
@@ -230,6 +231,11 @@
 					<artifactId>logback-core</artifactId>
 					<version>${logback.version}</version>
 				</dependency>
+				<dependency>
+					<groupId>com.esotericsoftware.kryo</groupId>
+					<artifactId>kryo</artifactId>
+					<version>${kryo.version}</version>
+				</dependency>
 				<dependency>
 					<groupId>com.fasterxml.jackson.core</groupId>
 					<artifactId>jackson-annotations</artifactId>
@@ -959,7 +965,7 @@
 
         <dependency>
           <groupId>org.apache.flink</groupId>
-          <artifactId>flink-runtime_2.11</artifactId>
+          <artifactId>flink-runtime</artifactId>
           <version>${flink.version}</version>
           <type>test-jar</type>
         </dependency>
@@ -1218,17 +1224,12 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.flink</groupId>
-                <artifactId>flink-cep_2.11</artifactId>
-                <version>${flink.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.flink</groupId>
-                <artifactId>flink-cep-scala_2.11</artifactId>
+                <artifactId>flink-cep</artifactId>
                 <version>${flink.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.flink</groupId>
-                <artifactId>flink-runtime_2.11</artifactId>
+                <artifactId>flink-runtime</artifactId>
                 <version>${flink.version}</version>
             </dependency>
             <dependency>
diff --git a/streampipes-commons/src/main/java/org/apache/streampipes/commons/constants/Envs.java b/streampipes-commons/src/main/java/org/apache/streampipes/commons/constants/Envs.java
index 92094b2eb..23f16489f 100644
--- a/streampipes-commons/src/main/java/org/apache/streampipes/commons/constants/Envs.java
+++ b/streampipes-commons/src/main/java/org/apache/streampipes/commons/constants/Envs.java
@@ -67,7 +67,15 @@ public enum Envs {
 
   SP_TS_STORAGE_ORG("SP_TS_STORAGE_ORG", "sp"),
 
-  SP_TS_STORAGE_BUCKET("SP_TS_STORAGE_BUCKET", "sp");
+  SP_TS_STORAGE_BUCKET("SP_TS_STORAGE_BUCKET", "sp"),
+
+  SP_FLINK_JAR_FILE_LOC(
+      "SP_FLINK_JAR_FILE_LOC",
+      "./streampipes-processing-element-container.jar"),
+
+  SP_FLINK_JOBMANAGER_HOST("SP_FLINK_JOBMANAGER_HOST", "jobmanager"),
+
+  SP_FLINK_JOBMANAGER_PORT("SP_FLINK_JOBMANAGER_PORT", "8081");
 
   private final String envVariableName;
   private String defaultValue;
diff --git a/streampipes-commons/src/main/java/org/apache/streampipes/commons/environment/DefaultEnvironment.java b/streampipes-commons/src/main/java/org/apache/streampipes/commons/environment/DefaultEnvironment.java
index 83fd1ebd1..4f6d71cb1 100644
--- a/streampipes-commons/src/main/java/org/apache/streampipes/commons/environment/DefaultEnvironment.java
+++ b/streampipes-commons/src/main/java/org/apache/streampipes/commons/environment/DefaultEnvironment.java
@@ -179,6 +179,21 @@ public class DefaultEnvironment implements Environment {
     return new StringEnvironmentVariable(Envs.SP_CORE_ASSET_BASE_DIR);
   }
 
+  @Override
+  public StringEnvironmentVariable getFlinkJarFileLoc() {
+    return new StringEnvironmentVariable(Envs.SP_FLINK_JAR_FILE_LOC);
+  }
+
+  @Override
+  public StringEnvironmentVariable getFlinkJobmanagerHost() {
+    return new StringEnvironmentVariable(Envs.SP_FLINK_JOBMANAGER_HOST);
+  }
+
+  @Override
+  public IntEnvironmentVariable getFlinkJobmanagerPort() {
+    return new IntEnvironmentVariable(Envs.SP_FLINK_JOBMANAGER_PORT);
+  }
+
   @Override
   public StringEnvironmentVariable getConsulLocation() {
     return new StringEnvironmentVariable(Envs.SP_CONSUL_LOCATION);
diff --git a/streampipes-commons/src/main/java/org/apache/streampipes/commons/environment/Environment.java b/streampipes-commons/src/main/java/org/apache/streampipes/commons/environment/Environment.java
index c4a9081a4..7217d261a 100644
--- a/streampipes-commons/src/main/java/org/apache/streampipes/commons/environment/Environment.java
+++ b/streampipes-commons/src/main/java/org/apache/streampipes/commons/environment/Environment.java
@@ -102,4 +102,11 @@ public interface Environment {
   StringEnvironmentVariable getInitialAdminPassword();
 
   StringEnvironmentVariable getCoreAssetBaseDir();
+
+  // Flink Wrapper
+  StringEnvironmentVariable getFlinkJarFileLoc();
+
+  StringEnvironmentVariable getFlinkJobmanagerHost();
+
+  IntEnvironmentVariable getFlinkJobmanagerPort();
 }
diff --git a/streampipes-data-explorer-commons/src/main/java/org/apache/streampipes/dataexplorer/commons/DataExplorerUtils.java b/streampipes-data-explorer-commons/src/main/java/org/apache/streampipes/dataexplorer/commons/DataExplorerUtils.java
index a969aca7f..85259ad65 100644
--- a/streampipes-data-explorer-commons/src/main/java/org/apache/streampipes/dataexplorer/commons/DataExplorerUtils.java
+++ b/streampipes-data-explorer-commons/src/main/java/org/apache/streampipes/dataexplorer/commons/DataExplorerUtils.java
@@ -17,7 +17,7 @@
  */
 package org.apache.streampipes.dataexplorer.commons;
 
-import org.apache.streampipes.client.StreamPipesClient;
+import org.apache.streampipes.client.api.IStreamPipesClient;
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
 import org.apache.streampipes.dataexplorer.commons.influx.InfluxNameSanitizer;
 import org.apache.streampipes.model.datalake.DataLakeMeasure;
@@ -33,7 +33,7 @@ public class DataExplorerUtils {
    * @param client  StreamPipes client to store measure
    * @param measure DataLakeMeasurement
    */
-  public static DataLakeMeasure sanitizeAndRegisterAtDataLake(StreamPipesClient client,
+  public static DataLakeMeasure sanitizeAndRegisterAtDataLake(IStreamPipesClient client,
                                                               DataLakeMeasure measure) throws SpRuntimeException {
     sanitizeDataLakeMeasure(measure);
     registerAtDataLake(client, measure);
@@ -41,19 +41,19 @@ public class DataExplorerUtils {
     return measure;
   }
 
-  public static DataLakeMeasure sanitizeAndUpdateAtDataLake(StreamPipesClient client,
+  public static DataLakeMeasure sanitizeAndUpdateAtDataLake(IStreamPipesClient client,
                                                             DataLakeMeasure measure) throws SpRuntimeException {
     sanitizeDataLakeMeasure(measure);
     updateAtDataLake(client, measure);
     return measure;
   }
 
-  private static void registerAtDataLake(StreamPipesClient client,
+  private static void registerAtDataLake(IStreamPipesClient client,
                                          DataLakeMeasure measure) throws SpRuntimeException {
     client.dataLakeMeasureApi().create(measure);
   }
 
-  public static void updateAtDataLake(StreamPipesClient client,
+  public static void updateAtDataLake(IStreamPipesClient client,
                                       DataLakeMeasure measure) throws SpRuntimeException {
     client.dataLakeMeasureApi().update(measure);
   }
diff --git a/streampipes-data-explorer-commons/src/main/java/org/apache/streampipes/dataexplorer/commons/TimeSeriesStore.java b/streampipes-data-explorer-commons/src/main/java/org/apache/streampipes/dataexplorer/commons/TimeSeriesStore.java
index 687f13961..99ab51281 100644
--- a/streampipes-data-explorer-commons/src/main/java/org/apache/streampipes/dataexplorer/commons/TimeSeriesStore.java
+++ b/streampipes-data-explorer-commons/src/main/java/org/apache/streampipes/dataexplorer/commons/TimeSeriesStore.java
@@ -18,7 +18,7 @@
 
 package org.apache.streampipes.dataexplorer.commons;
 
-import org.apache.streampipes.client.StreamPipesClient;
+import org.apache.streampipes.client.api.IStreamPipesClient;
 import org.apache.streampipes.commons.environment.Environment;
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
 import org.apache.streampipes.dataexplorer.commons.image.ImageStore;
@@ -39,7 +39,7 @@ public class TimeSeriesStore {
 
 
   public TimeSeriesStore(Environment environment,
-                         StreamPipesClient client,
+                         IStreamPipesClient client,
                          DataLakeMeasure measure,
                          boolean enableImageStore) {
 
diff --git a/streampipes-extensions-api/pom.xml b/streampipes-extensions-api/pom.xml
index 942cbcfe3..c1c609dd6 100644
--- a/streampipes-extensions-api/pom.xml
+++ b/streampipes-extensions-api/pom.xml
@@ -33,6 +33,11 @@
             <artifactId>streampipes-client-api</artifactId>
             <version>0.93.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.streampipes</groupId>
+            <artifactId>streampipes-messaging</artifactId>
+            <version>0.93.0-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.streampipes</groupId>
             <artifactId>streampipes-model</artifactId>
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/hasher/algorithm/HashAlgorithm.java b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/extractor/IDataSinkParameterExtractor.java
similarity index 79%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/hasher/algorithm/HashAlgorithm.java
rename to streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/extractor/IDataSinkParameterExtractor.java
index d7c7ef09a..16c69c572 100644
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/hasher/algorithm/HashAlgorithm.java
+++ b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/extractor/IDataSinkParameterExtractor.java
@@ -16,11 +16,9 @@
  *
  */
 
-package org.apache.streampipes.processors.transformation.flink.processor.hasher.algorithm;
+package org.apache.streampipes.extensions.api.extractor;
 
-import java.io.Serializable;
+import org.apache.streampipes.model.graph.DataSinkInvocation;
 
-public interface HashAlgorithm extends Serializable {
-
-  String toHashValue(Object value);
+public interface IDataSinkParameterExtractor extends IParameterExtractor<DataSinkInvocation>  {
 }
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/rate/EventRate.java b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/IStreamPipesDataProcessor.java
similarity index 52%
copy from streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/rate/EventRate.java
copy to streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/IStreamPipesDataProcessor.java
index acff08858..ad4ee3743 100644
--- a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/rate/EventRate.java
+++ b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/IStreamPipesDataProcessor.java
@@ -15,26 +15,25 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.processors.aggregation.flink.processor.rate;
 
+package org.apache.streampipes.extensions.api.pe;
+
+import org.apache.streampipes.extensions.api.pe.config.IDataProcessorConfiguration;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.param.IDataProcessorParameters;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.runtime.Event;
 
-import org.apache.flink.shaded.guava18.com.google.common.collect.Iterables;
-import org.apache.flink.streaming.api.functions.windowing.AllWindowFunction;
-import org.apache.flink.streaming.api.windowing.windows.TimeWindow;
-import org.apache.flink.util.Collector;
+public interface IStreamPipesDataProcessor
+    extends IStreamPipesPipelineElement<IDataProcessorConfiguration> {
 
-public class EventRate implements AllWindowFunction<Event, Float, TimeWindow> {
+  void onPipelineStarted(IDataProcessorParameters params,
+                         SpOutputCollector collector,
+                         EventProcessorRuntimeContext runtimeContext);
 
-  private Integer timeWindowSize;
+  void onEvent(Event event,
+               SpOutputCollector collector);
 
-  public EventRate(Integer timeWindowSize) {
-    this.timeWindowSize = timeWindowSize;
-  }
+  void onPipelineStopped();
 
-  @Override
-  public void apply(TimeWindow timeWindow, Iterable<Event> iterable, Collector<Float> collector)
-      throws Exception {
-    collector.collect((float) Iterables.size(iterable) / timeWindowSize);
-  }
 }
diff --git a/streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/runtime/EventSink.java b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/IStreamPipesDataSink.java
similarity index 58%
rename from streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/runtime/EventSink.java
rename to streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/IStreamPipesDataSink.java
index c6bc8ff50..abc9d18c6 100644
--- a/streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/runtime/EventSink.java
+++ b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/IStreamPipesDataSink.java
@@ -16,20 +16,20 @@
  *
  */
 
-package org.apache.streampipes.wrapper.runtime;
+package org.apache.streampipes.extensions.api.pe;
 
-import org.apache.streampipes.commons.exceptions.SpRuntimeException;
-import org.apache.streampipes.model.graph.DataSinkInvocation;
+import org.apache.streampipes.extensions.api.pe.config.IDataSinkConfiguration;
+import org.apache.streampipes.extensions.api.pe.context.EventSinkRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.param.IDataSinkParameters;
 import org.apache.streampipes.model.runtime.Event;
-import org.apache.streampipes.wrapper.context.EventSinkRuntimeContext;
-import org.apache.streampipes.wrapper.params.binding.EventSinkBindingParams;
 
-public interface EventSink<T extends EventSinkBindingParams> extends PipelineElement<T,
-    DataSinkInvocation> {
+public interface IStreamPipesDataSink
+    extends IStreamPipesPipelineElement<IDataSinkConfiguration> {
 
-  void onInvocation(T parameters, EventSinkRuntimeContext runtimeContext) throws
-      SpRuntimeException;
+  void onPipelineStarted(IDataSinkParameters params,
+                         EventSinkRuntimeContext runtimeContext);
 
-  void onEvent(Event event) throws SpRuntimeException;
+  void onEvent(Event event);
 
+  void onPipelineStopped();
 }
diff --git a/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/declarer/DataStreamDeclarer.java b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/IStreamPipesDataStream.java
similarity index 78%
copy from streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/declarer/DataStreamDeclarer.java
copy to streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/IStreamPipesDataStream.java
index 2e8a87515..9f0c25b97 100644
--- a/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/declarer/DataStreamDeclarer.java
+++ b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/IStreamPipesDataStream.java
@@ -15,13 +15,12 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.extensions.api.declarer;
 
-import org.apache.streampipes.model.SpDataStream;
+package org.apache.streampipes.extensions.api.pe;
 
-public interface DataStreamDeclarer extends Declarer<SpDataStream> {
+import org.apache.streampipes.extensions.api.pe.config.IDataStreamConfiguration;
 
-  SpDataStream declareModel();
+public interface IStreamPipesDataStream extends IStreamPipesPipelineElement<IDataStreamConfiguration> {
 
   void executeStream();
 
diff --git a/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/declarer/Declarer.java b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/IStreamPipesPipelineElement.java
similarity index 76%
copy from streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/declarer/Declarer.java
copy to streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/IStreamPipesPipelineElement.java
index 3ff7dfd78..214495551 100644
--- a/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/declarer/Declarer.java
+++ b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/IStreamPipesPipelineElement.java
@@ -16,13 +16,11 @@
  *
  */
 
-package org.apache.streampipes.extensions.api.declarer;
+package org.apache.streampipes.extensions.api.pe;
 
+import org.apache.streampipes.extensions.api.pe.config.IPipelineElementConfiguration;
 
-import org.apache.streampipes.model.base.NamedStreamPipesEntity;
-
-public interface Declarer<T extends NamedStreamPipesEntity> {
-
-  T declareModel();
+public interface IStreamPipesPipelineElement<PcT extends IPipelineElementConfiguration<?, ?>> {
 
+  PcT declareConfig();
 }
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/hasher/algorithm/Md5HashAlgorithm.java b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/config/IDataProcessorConfiguration.java
similarity index 62%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/hasher/algorithm/Md5HashAlgorithm.java
rename to streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/config/IDataProcessorConfiguration.java
index 9fb14d564..18f6b5a89 100644
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/hasher/algorithm/Md5HashAlgorithm.java
+++ b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/config/IDataProcessorConfiguration.java
@@ -16,17 +16,19 @@
  *
  */
 
-package org.apache.streampipes.processors.transformation.flink.processor.hasher.algorithm;
+package org.apache.streampipes.extensions.api.pe.config;
 
-import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.streampipes.extensions.api.pe.IStreamPipesDataProcessor;
+import org.apache.streampipes.model.graph.DataProcessorDescription;
 
-public class Md5HashAlgorithm implements HashAlgorithm {
+import java.util.function.Supplier;
 
-  private static final long serialVersionUID = 1L;
+public interface IDataProcessorConfiguration
+    extends IPipelineElementConfiguration<DataProcessorDescription, IStreamPipesDataProcessor> {
 
   @Override
-  public String toHashValue(Object value) {
-    return DigestUtils.md5Hex(String.valueOf(value));
-  }
+  DataProcessorDescription getDescription();
 
+  @Override
+  Supplier<IStreamPipesDataProcessor> getSupplier();
 }
diff --git a/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/declarer/SemanticEventConsumerDeclarer.java b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/config/IDataSinkConfiguration.java
similarity index 77%
copy from streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/declarer/SemanticEventConsumerDeclarer.java
copy to streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/config/IDataSinkConfiguration.java
index 8670179cc..9fce81c0b 100644
--- a/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/declarer/SemanticEventConsumerDeclarer.java
+++ b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/config/IDataSinkConfiguration.java
@@ -16,11 +16,11 @@
  *
  */
 
-package org.apache.streampipes.extensions.api.declarer;
+package org.apache.streampipes.extensions.api.pe.config;
 
+import org.apache.streampipes.extensions.api.pe.IStreamPipesDataSink;
 import org.apache.streampipes.model.graph.DataSinkDescription;
-import org.apache.streampipes.model.graph.DataSinkInvocation;
-
-public interface SemanticEventConsumerDeclarer extends InvocableDeclarer<DataSinkDescription, DataSinkInvocation> {
 
+public interface IDataSinkConfiguration
+    extends IPipelineElementConfiguration<DataSinkDescription, IStreamPipesDataSink> {
 }
diff --git a/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/declarer/PipelineTemplateDeclarer.java b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/config/IDataStreamConfiguration.java
similarity index 72%
rename from streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/declarer/PipelineTemplateDeclarer.java
rename to streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/config/IDataStreamConfiguration.java
index 213beacad..eff3ccabe 100644
--- a/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/declarer/PipelineTemplateDeclarer.java
+++ b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/config/IDataStreamConfiguration.java
@@ -15,11 +15,12 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.extensions.api.declarer;
 
-import org.apache.streampipes.model.template.PipelineTemplateDescription;
+package org.apache.streampipes.extensions.api.pe.config;
 
-public interface PipelineTemplateDeclarer extends Declarer<PipelineTemplateDescription> {
+import org.apache.streampipes.extensions.api.pe.IStreamPipesDataStream;
+import org.apache.streampipes.model.SpDataStream;
 
-  PipelineTemplateDescription declareModel();
+public interface IDataStreamConfiguration
+    extends IPipelineElementConfiguration<SpDataStream, IStreamPipesDataStream> {
 }
diff --git a/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/declarer/InvocableDeclarer.java b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/config/IPipelineElementConfiguration.java
similarity index 67%
copy from streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/declarer/InvocableDeclarer.java
copy to streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/config/IPipelineElementConfiguration.java
index 931d158cc..e01f7adeb 100644
--- a/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/declarer/InvocableDeclarer.java
+++ b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/config/IPipelineElementConfiguration.java
@@ -16,16 +16,17 @@
  *
  */
 
-package org.apache.streampipes.extensions.api.declarer;
+package org.apache.streampipes.extensions.api.pe.config;
 
-import org.apache.streampipes.model.Response;
-import org.apache.streampipes.model.base.InvocableStreamPipesEntity;
+import org.apache.streampipes.extensions.api.pe.IStreamPipesPipelineElement;
 import org.apache.streampipes.model.base.NamedStreamPipesEntity;
 
-public interface InvocableDeclarer<T extends NamedStreamPipesEntity,
-    K extends InvocableStreamPipesEntity> extends Declarer<T> {
+import java.util.function.Supplier;
 
-  Response invokeRuntime(K invocationGraph, String serviceId);
+public interface IPipelineElementConfiguration<NeT extends NamedStreamPipesEntity,
+    PeT extends IStreamPipesPipelineElement<?>> {
 
-  Response detachRuntime(String pipelineId, String serviceId);
+  NeT getDescription();
+
+  Supplier<PeT> getSupplier();
 }
diff --git a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/sentiment/SentimentDetectionParameters.java b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/context/EventProcessorRuntimeContext.java
similarity index 85%
rename from streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/sentiment/SentimentDetectionParameters.java
rename to streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/context/EventProcessorRuntimeContext.java
index af512b553..80e691b99 100644
--- a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/sentiment/SentimentDetectionParameters.java
+++ b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/context/EventProcessorRuntimeContext.java
@@ -15,7 +15,10 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.processors.textmining.flink.processor.sentiment;
+package org.apache.streampipes.extensions.api.pe.context;
+
+public interface EventProcessorRuntimeContext extends RuntimeContext {
+
+
 
-public class SentimentDetectionParameters {
 }
diff --git a/streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/context/EventSinkRuntimeContext.java b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/context/EventSinkRuntimeContext.java
similarity index 93%
rename from streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/context/EventSinkRuntimeContext.java
rename to streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/context/EventSinkRuntimeContext.java
index fa4a0394f..685358497 100644
--- a/streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/context/EventSinkRuntimeContext.java
+++ b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/context/EventSinkRuntimeContext.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.wrapper.context;
+package org.apache.streampipes.extensions.api.pe.context;
 
 public interface EventSinkRuntimeContext extends RuntimeContext {
 }
diff --git a/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/declarer/DataStreamDeclarer.java b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/context/IContextGenerator.java
similarity index 75%
rename from streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/declarer/DataStreamDeclarer.java
rename to streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/context/IContextGenerator.java
index 2e8a87515..8db574dbe 100644
--- a/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/declarer/DataStreamDeclarer.java
+++ b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/context/IContextGenerator.java
@@ -15,15 +15,12 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.extensions.api.declarer;
 
-import org.apache.streampipes.model.SpDataStream;
+package org.apache.streampipes.extensions.api.pe.context;
 
-public interface DataStreamDeclarer extends Declarer<SpDataStream> {
+import org.apache.streampipes.model.base.InvocableStreamPipesEntity;
 
-  SpDataStream declareModel();
+public interface IContextGenerator<RcT extends RuntimeContext, IvT extends InvocableStreamPipesEntity> {
 
-  void executeStream();
-
-  boolean isExecutable();
+  RcT makeContext(IvT invocation);
 }
diff --git a/streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/context/RuntimeContext.java b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/context/RuntimeContext.java
similarity index 67%
rename from streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/context/RuntimeContext.java
rename to streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/context/RuntimeContext.java
index 8fe7bd522..5c6e1ae71 100644
--- a/streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/context/RuntimeContext.java
+++ b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/context/RuntimeContext.java
@@ -15,29 +15,21 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.wrapper.context;
+package org.apache.streampipes.extensions.api.pe.context;
 
-import org.apache.streampipes.client.StreamPipesClient;
+import org.apache.streampipes.client.api.IStreamPipesClient;
+import org.apache.streampipes.extensions.api.config.IConfigExtractor;
 import org.apache.streampipes.extensions.api.monitoring.SpMonitoringManager;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
-import org.apache.streampipes.model.runtime.SchemaInfo;
-import org.apache.streampipes.model.runtime.SourceInfo;
-
-import java.util.List;
 
 public interface RuntimeContext {
 
   SpMonitoringManager getLogger();
 
-  List<SchemaInfo> getInputSchemaInfo();
-
-  List<SourceInfo> getInputSourceInfo();
-
   String getCorrespondingUser();
 
-  ConfigExtractor getConfigStore();
+  IConfigExtractor getConfigStore();
 
-  StreamPipesClient getStreamPipesClient();
+  IStreamPipesClient getStreamPipesClient();
 
 
 }
diff --git a/streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/params/binding/EventSinkBindingParams.java b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/param/IDataProcessorParameters.java
similarity index 58%
copy from streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/params/binding/EventSinkBindingParams.java
copy to streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/param/IDataProcessorParameters.java
index f2b2543d6..8320da463 100644
--- a/streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/params/binding/EventSinkBindingParams.java
+++ b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/param/IDataProcessorParameters.java
@@ -16,24 +16,24 @@
  *
  */
 
-package org.apache.streampipes.wrapper.params.binding;
+package org.apache.streampipes.extensions.api.pe.param;
 
-import org.apache.streampipes.model.graph.DataSinkInvocation;
+import org.apache.streampipes.extensions.api.extractor.IDataProcessorParameterExtractor;
+import org.apache.streampipes.model.graph.DataProcessorInvocation;
 import org.apache.streampipes.model.output.PropertyRenameRule;
+import org.apache.streampipes.model.runtime.SchemaInfo;
+import org.apache.streampipes.model.runtime.SourceInfo;
 
-import java.io.Serializable;
-import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
-public class EventSinkBindingParams extends BindingParams<DataSinkInvocation> implements Serializable {
-  private static final long serialVersionUID = 1L;
+public interface IDataProcessorParameters
+    extends IPipelineElementParameters<DataProcessorInvocation, IDataProcessorParameterExtractor> {
 
-  public EventSinkBindingParams(DataSinkInvocation graph) {
-    super(new DataSinkInvocation(graph));
-  }
+  Map<String, Object> getOutEventType();
 
-  @Override
-  protected List<PropertyRenameRule> getRenameRules() {
-    return Collections.emptyList();
-  }
+  SchemaInfo getOutputSchemaInfo();
+
+  SourceInfo getOutputSourceInfo();
+  List<PropertyRenameRule> getRenameRules();
 }
diff --git a/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/declarer/SemanticEventConsumerDeclarer.java b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/param/IDataSinkParameters.java
similarity index 76%
copy from streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/declarer/SemanticEventConsumerDeclarer.java
copy to streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/param/IDataSinkParameters.java
index 8670179cc..452b9b52e 100644
--- a/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/declarer/SemanticEventConsumerDeclarer.java
+++ b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/param/IDataSinkParameters.java
@@ -16,11 +16,11 @@
  *
  */
 
-package org.apache.streampipes.extensions.api.declarer;
+package org.apache.streampipes.extensions.api.pe.param;
 
-import org.apache.streampipes.model.graph.DataSinkDescription;
+import org.apache.streampipes.extensions.api.extractor.IDataSinkParameterExtractor;
 import org.apache.streampipes.model.graph.DataSinkInvocation;
 
-public interface SemanticEventConsumerDeclarer extends InvocableDeclarer<DataSinkDescription, DataSinkInvocation> {
-
+public interface IDataSinkParameters
+    extends IPipelineElementParameters<DataSinkInvocation, IDataSinkParameterExtractor> {
 }
diff --git a/streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/context/EventProcessorRuntimeContext.java b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/param/IInternalRuntimeParameters.java
similarity index 71%
rename from streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/context/EventProcessorRuntimeContext.java
rename to streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/param/IInternalRuntimeParameters.java
index 09d83c3c2..08c78f001 100644
--- a/streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/context/EventProcessorRuntimeContext.java
+++ b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/param/IInternalRuntimeParameters.java
@@ -15,15 +15,17 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.wrapper.context;
 
-import org.apache.streampipes.model.runtime.SchemaInfo;
-import org.apache.streampipes.model.runtime.SourceInfo;
+package org.apache.streampipes.extensions.api.pe.param;
 
-public interface EventProcessorRuntimeContext extends RuntimeContext {
+import org.apache.streampipes.model.runtime.Event;
 
-  SchemaInfo getOutputSchemaInfo();
+import java.util.Map;
 
-  SourceInfo getOutputSourceInfo();
+public interface IInternalRuntimeParameters {
+
+  Event makeEvent(IPipelineElementParameters<?, ?> parameters,
+                  Map<String, Object> mapEvent,
+                  String sourceId);
 
 }
diff --git a/streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/runtime/PipelineElement.java b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/param/IParameterGenerator.java
similarity index 71%
rename from streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/runtime/PipelineElement.java
rename to streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/param/IParameterGenerator.java
index 4041fef36..fef867b04 100644
--- a/streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/runtime/PipelineElement.java
+++ b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/param/IParameterGenerator.java
@@ -16,15 +16,16 @@
  *
  */
 
-package org.apache.streampipes.wrapper.runtime;
+package org.apache.streampipes.extensions.api.pe.param;
 
-import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.extractor.IParameterExtractor;
 import org.apache.streampipes.model.base.InvocableStreamPipesEntity;
-import org.apache.streampipes.wrapper.params.binding.BindingParams;
 
-public interface PipelineElement<K extends BindingParams<V>, V extends
-    InvocableStreamPipesEntity> {
+public interface IParameterGenerator<
+    IvT extends InvocableStreamPipesEntity,
+    PeT extends IParameterExtractor<IvT>,
+    K extends IPipelineElementParameters<IvT, PeT>> {
 
-  void onDetach() throws SpRuntimeException;
 
+  K makeParameters(IvT invocation);
 }
diff --git a/streampipes-wrapper-standalone/src/main/java/org/apache/streampipes/wrapper/standalone/AbstractConfiguredPipelineElement.java b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/param/IPipelineElementParameters.java
similarity index 52%
rename from streampipes-wrapper-standalone/src/main/java/org/apache/streampipes/wrapper/standalone/AbstractConfiguredPipelineElement.java
rename to streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/param/IPipelineElementParameters.java
index 01c42ba73..2ef9dc3d1 100644
--- a/streampipes-wrapper-standalone/src/main/java/org/apache/streampipes/wrapper/standalone/AbstractConfiguredPipelineElement.java
+++ b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/param/IPipelineElementParameters.java
@@ -15,32 +15,40 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.wrapper.standalone;
 
+package org.apache.streampipes.extensions.api.pe.param;
+
+import org.apache.streampipes.extensions.api.extractor.IParameterExtractor;
 import org.apache.streampipes.model.base.InvocableStreamPipesEntity;
-import org.apache.streampipes.wrapper.params.binding.BindingParams;
-import org.apache.streampipes.wrapper.runtime.PipelineElement;
+import org.apache.streampipes.model.runtime.SchemaInfo;
+import org.apache.streampipes.model.runtime.SourceInfo;
+
+import java.util.List;
+import java.util.Map;
+
+public interface IPipelineElementParameters<
+    IvT extends InvocableStreamPipesEntity,
+    ExT extends IParameterExtractor<IvT>> {
+
+  IvT getModel();
+
+  ExT getExtractor();
+
+  ExT extractor();
+
+  List<InputStreamParams> getInputStreamParams();
+
+  Map<String, Map<String, Object>> getInEventTypes();
+
+  List<SchemaInfo> getInputSchemaInfos();
 
-import java.util.function.Supplier;
+  List<SourceInfo> getInputSourceInfos();
 
-public class AbstractConfiguredPipelineElement<K extends InvocableStreamPipesEntity,
-    V extends BindingParams<K>,
-    T extends PipelineElement<V, K>> {
+  SchemaInfo getInputSchemaInfo(int index);
 
-  private V bindingParams;
-  private Supplier<T> engineSupplier;
+  SourceInfo getInputSourceInfo(int index);
 
-  public AbstractConfiguredPipelineElement(V bindingParams,
-                                           Supplier<T> engineSupplier) {
-    this.bindingParams = bindingParams;
-    this.engineSupplier = engineSupplier;
-  }
+  Integer getSourceIndex(String sourceId);
 
-  public V getBindingParams() {
-    return bindingParams;
-  }
 
-  public Supplier<T> getEngineSupplier() {
-    return engineSupplier;
-  }
 }
diff --git a/streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/params/binding/InputStreamParams.java b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/param/InputStreamParams.java
similarity index 86%
rename from streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/params/binding/InputStreamParams.java
rename to streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/param/InputStreamParams.java
index a63d58492..4c62289c7 100644
--- a/streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/params/binding/InputStreamParams.java
+++ b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/param/InputStreamParams.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.wrapper.params.binding;
+package org.apache.streampipes.extensions.api.pe.param;
 
 import org.apache.streampipes.model.SpDataStream;
 import org.apache.streampipes.model.constants.PropertySelectorConstants;
@@ -34,14 +34,15 @@ public class InputStreamParams implements Serializable {
 
   private static final long serialVersionUID = -240772928651344246L;
 
-  private EventGrounding eventGrounding;
-  private EventSchema eventSchema;
-  private String inName;
-  private SourceInfo sourceInfo;
-  private SchemaInfo schemaInfo;
+  private final EventGrounding eventGrounding;
+  private final EventSchema eventSchema;
+  private final String inName;
+  private final SourceInfo sourceInfo;
+  private final SchemaInfo schemaInfo;
 
-  public InputStreamParams(Integer streamId, SpDataStream inputStream, List<PropertyRenameRule>
-      propertyRenameRules) {
+  public InputStreamParams(Integer streamId,
+                           SpDataStream inputStream,
+                           List<PropertyRenameRule> propertyRenameRules) {
     super();
     this.eventGrounding = inputStream.getEventGrounding();
     this.inName = eventGrounding.getTransportProtocol().getTopicDefinition().getActualTopicName();
diff --git a/streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/params/binding/OutputStreamParams.java b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/param/OutputStreamParams.java
similarity index 93%
rename from streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/params/binding/OutputStreamParams.java
rename to streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/param/OutputStreamParams.java
index 9272c1af5..e261b390c 100644
--- a/streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/params/binding/OutputStreamParams.java
+++ b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/param/OutputStreamParams.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.wrapper.params.binding;
+package org.apache.streampipes.extensions.api.pe.param;
 
 import org.apache.streampipes.model.SpDataStream;
 import org.apache.streampipes.model.grounding.EventGrounding;
@@ -29,8 +29,8 @@ import java.util.List;
 
 public class OutputStreamParams implements Serializable {
 
-  private SourceInfo sourceInfo;
-  private SchemaInfo schemaInfo;
+  private final SourceInfo sourceInfo;
+  private final SchemaInfo schemaInfo;
 
   public OutputStreamParams(SpDataStream outputStream, List<PropertyRenameRule>
       propertyRenameRules) {
diff --git a/streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/routing/PipelineElementCollector.java b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/routing/PipelineElementCollector.java
similarity index 95%
rename from streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/routing/PipelineElementCollector.java
rename to streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/routing/PipelineElementCollector.java
index 1095395ce..b8947e368 100644
--- a/streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/routing/PipelineElementCollector.java
+++ b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/routing/PipelineElementCollector.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.wrapper.routing;
+package org.apache.streampipes.extensions.api.pe.routing;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
 
diff --git a/streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/routing/RawDataProcessor.java b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/routing/RawDataProcessor.java
similarity index 94%
rename from streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/routing/RawDataProcessor.java
rename to streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/routing/RawDataProcessor.java
index bb4117c26..6fc85ef54 100644
--- a/streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/routing/RawDataProcessor.java
+++ b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/routing/RawDataProcessor.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-package org.apache.streampipes.wrapper.routing;
+package org.apache.streampipes.extensions.api.pe.routing;
 
 import java.util.Map;
 
diff --git a/streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/routing/SpInputCollector.java b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/routing/SpInputCollector.java
similarity index 93%
rename from streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/routing/SpInputCollector.java
rename to streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/routing/SpInputCollector.java
index 275f3fc97..0da49660a 100644
--- a/streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/routing/SpInputCollector.java
+++ b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/routing/SpInputCollector.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.wrapper.routing;
+package org.apache.streampipes.extensions.api.pe.routing;
 
 public interface SpInputCollector extends
     PipelineElementCollector<RawDataProcessor> {
diff --git a/streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/routing/SpOutputCollector.java b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/routing/SpOutputCollector.java
similarity index 94%
copy from streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/routing/SpOutputCollector.java
copy to streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/routing/SpOutputCollector.java
index 69ab08476..f71fba85e 100644
--- a/streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/routing/SpOutputCollector.java
+++ b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/routing/SpOutputCollector.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.streampipes.wrapper.routing;
+package org.apache.streampipes.extensions.api.pe.routing;
 
 import org.apache.streampipes.messaging.InternalEventProcessor;
 import org.apache.streampipes.model.runtime.Event;
diff --git a/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/declarer/SemanticEventProcessingAgentDeclarer.java b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/runtime/IDataProcessorRuntime.java
similarity index 77%
rename from streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/declarer/SemanticEventProcessingAgentDeclarer.java
rename to streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/runtime/IDataProcessorRuntime.java
index 52cccc3ae..eef047d01 100644
--- a/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/declarer/SemanticEventProcessingAgentDeclarer.java
+++ b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/runtime/IDataProcessorRuntime.java
@@ -16,12 +16,11 @@
  *
  */
 
-package org.apache.streampipes.extensions.api.declarer;
+package org.apache.streampipes.extensions.api.pe.runtime;
 
-import org.apache.streampipes.model.graph.DataProcessorDescription;
+import org.apache.streampipes.extensions.api.pe.IStreamPipesDataProcessor;
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
 
-public interface SemanticEventProcessingAgentDeclarer
-    extends InvocableDeclarer<DataProcessorDescription, DataProcessorInvocation> {
+public interface IDataProcessorRuntime extends IStreamPipesRuntime<IStreamPipesDataProcessor, DataProcessorInvocation> {
 
 }
diff --git a/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/declarer/SemanticEventConsumerDeclarer.java b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/runtime/IDataSinkRuntime.java
similarity index 78%
rename from streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/declarer/SemanticEventConsumerDeclarer.java
rename to streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/runtime/IDataSinkRuntime.java
index 8670179cc..d87806431 100644
--- a/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/declarer/SemanticEventConsumerDeclarer.java
+++ b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/runtime/IDataSinkRuntime.java
@@ -16,11 +16,10 @@
  *
  */
 
-package org.apache.streampipes.extensions.api.declarer;
+package org.apache.streampipes.extensions.api.pe.runtime;
 
-import org.apache.streampipes.model.graph.DataSinkDescription;
+import org.apache.streampipes.extensions.api.pe.IStreamPipesDataSink;
 import org.apache.streampipes.model.graph.DataSinkInvocation;
 
-public interface SemanticEventConsumerDeclarer extends InvocableDeclarer<DataSinkDescription, DataSinkInvocation> {
-
+public interface IDataSinkRuntime extends IStreamPipesRuntime<IStreamPipesDataSink, DataSinkInvocation> {
 }
diff --git a/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/declarer/InvocableDeclarer.java b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/runtime/IStreamPipesRuntime.java
similarity index 66%
rename from streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/declarer/InvocableDeclarer.java
rename to streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/runtime/IStreamPipesRuntime.java
index 931d158cc..413e25aca 100644
--- a/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/declarer/InvocableDeclarer.java
+++ b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/runtime/IStreamPipesRuntime.java
@@ -16,16 +16,19 @@
  *
  */
 
-package org.apache.streampipes.extensions.api.declarer;
+package org.apache.streampipes.extensions.api.pe.runtime;
 
+import org.apache.streampipes.extensions.api.pe.IStreamPipesPipelineElement;
 import org.apache.streampipes.model.Response;
 import org.apache.streampipes.model.base.InvocableStreamPipesEntity;
-import org.apache.streampipes.model.base.NamedStreamPipesEntity;
 
-public interface InvocableDeclarer<T extends NamedStreamPipesEntity,
-    K extends InvocableStreamPipesEntity> extends Declarer<T> {
+public interface IStreamPipesRuntime<
+    PeT extends IStreamPipesPipelineElement<?>,
+    IvT extends InvocableStreamPipesEntity> {
 
-  Response invokeRuntime(K invocationGraph, String serviceId);
+  Response onRuntimeInvoked(String instanceId,
+                            PeT pipelineElement,
+                            IvT pipelineElementInvocation);
 
-  Response detachRuntime(String pipelineId, String serviceId);
+  Response onRuntimeDetached(String instanceId);
 }
diff --git a/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/declarer/Declarer.java b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/runtime/IStreamPipesRuntimeProvider.java
similarity index 76%
rename from streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/declarer/Declarer.java
rename to streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/runtime/IStreamPipesRuntimeProvider.java
index 3ff7dfd78..7beb04a93 100644
--- a/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/declarer/Declarer.java
+++ b/streampipes-extensions-api/src/main/java/org/apache/streampipes/extensions/api/pe/runtime/IStreamPipesRuntimeProvider.java
@@ -16,13 +16,14 @@
  *
  */
 
-package org.apache.streampipes.extensions.api.declarer;
+package org.apache.streampipes.extensions.api.pe.runtime;
 
+import java.util.function.Supplier;
 
-import org.apache.streampipes.model.base.NamedStreamPipesEntity;
+public interface IStreamPipesRuntimeProvider {
 
-public interface Declarer<T extends NamedStreamPipesEntity> {
+  Supplier<IDataProcessorRuntime> getDataProcessorRuntime();
 
-  T declareModel();
+  Supplier<IDataSinkRuntime> getDataSinkRuntime();
 
 }
diff --git a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/context/AdapterContextGenerator.java b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/context/AdapterContextGenerator.java
index b61aae8a6..84a3aa346 100644
--- a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/context/AdapterContextGenerator.java
+++ b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/context/AdapterContextGenerator.java
@@ -18,13 +18,12 @@
 
 package org.apache.streampipes.extensions.management.context;
 
-import org.apache.streampipes.client.StreamPipesClient;
 import org.apache.streampipes.extensions.api.connect.context.IAdapterGuessSchemaContext;
 import org.apache.streampipes.extensions.api.connect.context.IAdapterRuntimeContext;
 import org.apache.streampipes.extensions.api.monitoring.SpMonitoringManager;
-import org.apache.streampipes.extensions.management.client.StreamPipesClientResolver;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
-import org.apache.streampipes.extensions.management.init.DeclarersSingleton;
+
+import static org.apache.streampipes.extensions.management.util.RuntimeContextUtils.makeConfigExtractor;
+import static org.apache.streampipes.extensions.management.util.RuntimeContextUtils.makeStreamPipesClient;
 
 public class AdapterContextGenerator {
 
@@ -36,12 +35,5 @@ public class AdapterContextGenerator {
     return new SpAdapterGuessSchemaContext(makeConfigExtractor(), makeStreamPipesClient());
   }
 
-  private ConfigExtractor makeConfigExtractor() {
-    var serviceId = DeclarersSingleton.getInstance().getServiceId();
-    return ConfigExtractor.from(serviceId);
-  }
 
-  private StreamPipesClient makeStreamPipesClient() {
-    return new StreamPipesClientResolver().makeStreamPipesClientInstance();
-  }
 }
diff --git a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/init/DeclarersSingleton.java b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/init/DeclarersSingleton.java
index bd42ba0f9..80f4eca7a 100644
--- a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/init/DeclarersSingleton.java
+++ b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/init/DeclarersSingleton.java
@@ -21,12 +21,12 @@ package org.apache.streampipes.extensions.management.init;
 import org.apache.streampipes.dataformat.SpDataFormatFactory;
 import org.apache.streampipes.dataformat.SpDataFormatManager;
 import org.apache.streampipes.extensions.api.connect.StreamPipesAdapter;
-import org.apache.streampipes.extensions.api.declarer.DataStreamDeclarer;
-import org.apache.streampipes.extensions.api.declarer.Declarer;
 import org.apache.streampipes.extensions.api.declarer.IStreamPipesFunctionDeclarer;
-import org.apache.streampipes.extensions.api.declarer.PipelineTemplateDeclarer;
-import org.apache.streampipes.extensions.api.declarer.SemanticEventConsumerDeclarer;
-import org.apache.streampipes.extensions.api.declarer.SemanticEventProcessingAgentDeclarer;
+import org.apache.streampipes.extensions.api.pe.IStreamPipesDataProcessor;
+import org.apache.streampipes.extensions.api.pe.IStreamPipesDataSink;
+import org.apache.streampipes.extensions.api.pe.IStreamPipesDataStream;
+import org.apache.streampipes.extensions.api.pe.IStreamPipesPipelineElement;
+import org.apache.streampipes.extensions.api.pe.runtime.IStreamPipesRuntimeProvider;
 import org.apache.streampipes.extensions.management.model.SpServiceDefinition;
 import org.apache.streampipes.messaging.SpProtocolDefinitionFactory;
 import org.apache.streampipes.messaging.SpProtocolManager;
@@ -40,6 +40,7 @@ import org.apache.streampipes.svcdiscovery.api.model.ConfigItem;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
@@ -57,16 +58,17 @@ public class DeclarersSingleton implements IDeclarersSingleton {
   private static DeclarersSingleton instance;
   private SpServiceDefinition serviceDefinition;
 
-  private Map<String, SemanticEventProcessingAgentDeclarer> epaDeclarers;
-  private Map<String, SemanticEventConsumerDeclarer> consumerDeclarers;
-  private Map<String, PipelineTemplateDeclarer> pipelineTemplateDeclarers;
-  private Map<String, DataStreamDeclarer> streamDeclarers;
-  private Map<String, IStreamPipesFunctionDeclarer> functions;
+  private final Map<String, IStreamPipesDataProcessor> dataProcessors;
+  private final Map<String, IStreamPipesDataSink> dataSinks;
+  private final Map<String, IStreamPipesDataStream> dataStreams;
+  private final Map<String, IStreamPipesFunctionDeclarer> functions;
 
-  private Map<String, TransportProtocol> supportedProtocols;
-  private Map<String, TransportFormat> supportedFormats;
+  private final Map<String, TransportProtocol> supportedProtocols;
+  private final Map<String, TransportFormat> supportedFormats;
 
-  private Map<String, StreamPipesAdapter> adapters;
+  private final Map<String, StreamPipesAdapter> adapters;
+
+  private List<IStreamPipesRuntimeProvider> runtimeProviders;
 
   private String serviceId;
 
@@ -76,14 +78,14 @@ public class DeclarersSingleton implements IDeclarersSingleton {
 
 
   private DeclarersSingleton() {
-    this.epaDeclarers = new HashMap<>();
-    this.consumerDeclarers = new HashMap<>();
-    this.streamDeclarers = new HashMap<>();
-    this.pipelineTemplateDeclarers = new HashMap<>();
+    this.dataProcessors = new HashMap<>();
+    this.dataSinks = new HashMap<>();
+    this.dataStreams = new HashMap<>();
     this.supportedProtocols = new HashMap<>();
     this.supportedFormats = new HashMap<>();
     this.adapters = new HashMap<>();
     this.functions = new HashMap<>();
+    this.runtimeProviders = new ArrayList<>();
     this.route = "/";
   }
 
@@ -104,6 +106,7 @@ public class DeclarersSingleton implements IDeclarersSingleton {
     this.serviceId = serviceDef.getServiceId();
     this.registerProtocols(serviceDef.getProtocolDefinitionFactories());
     this.registerDataFormats(serviceDef.getDataFormatFactories());
+    this.runtimeProviders = serviceDef.getRuntimeProviders();
     serviceDef.getAdapters().forEach(a -> this.adapters.put(a.declareConfig().getAdapterDescription().getAppId(), a));
     serviceDef.getFunctions().forEach(f -> this.functions.put(f.getFunctionConfig().getFunctionId().getId(), f));
   }
@@ -117,34 +120,32 @@ public class DeclarersSingleton implements IDeclarersSingleton {
     spConfig.register(ConfigItem.from("SP_SERVICE_NAME", serviceName, ""));
   }
 
-  public void addDeclarers(List<Declarer<?>> allDeclarers) {
-    allDeclarers.forEach(this::add);
+  public void addDeclarers(List<IStreamPipesPipelineElement<?>> allPipelineElements) {
+    allPipelineElements.forEach(this::add);
   }
 
   @Deprecated
   /**
    * @Deprecated Use ServiceDefinitionBuilder instead
    */
-  public DeclarersSingleton add(Declarer<?> d) {
-    if (d instanceof SemanticEventProcessingAgentDeclarer) {
-      addEpaDeclarer((SemanticEventProcessingAgentDeclarer) d);
-    } else if (d instanceof DataStreamDeclarer) {
-      addStreamDeclarer((DataStreamDeclarer) d);
-    } else if (d instanceof SemanticEventConsumerDeclarer) {
-      addConsumerDeclarer((SemanticEventConsumerDeclarer) d);
-    } else if (d instanceof PipelineTemplateDeclarer) {
-      addPipelineTemplateDeclarer((PipelineTemplateDeclarer) d);
+  public DeclarersSingleton add(IStreamPipesPipelineElement<?> d) {
+    if (d instanceof IStreamPipesDataProcessor) {
+      addDataProcessor((IStreamPipesDataProcessor) d);
+    } else if (d instanceof IStreamPipesDataStream) {
+      addDataStream((IStreamPipesDataStream) d);
+    } else if (d instanceof IStreamPipesDataSink) {
+      addDataSink((IStreamPipesDataSink) d);
     }
 
     return getInstance();
   }
 
-  public Map<String, Declarer<?>> getDeclarers() {
-    Map<String, Declarer<?>> result = new HashMap<>();
-    result.putAll(epaDeclarers);
-    result.putAll(streamDeclarers);
-    result.putAll(consumerDeclarers);
-    result.putAll(pipelineTemplateDeclarers);
+  public Map<String, IStreamPipesPipelineElement<?>> getDeclarers() {
+    Map<String, IStreamPipesPipelineElement<?>> result = new HashMap<>();
+    result.putAll(dataProcessors);
+    result.putAll(dataStreams);
+    result.putAll(dataSinks);
+    //result.putAll(pipelineTemplateDeclarers);
     return result;
   }
 
@@ -172,38 +173,29 @@ public class DeclarersSingleton implements IDeclarersSingleton {
     dataFormatDefinitions.forEach(this::registerDataFormat);
   }
 
-  private void addEpaDeclarer(SemanticEventProcessingAgentDeclarer epaDeclarer) {
-    epaDeclarers.put(epaDeclarer.declareModel().getAppId(), epaDeclarer);
-  }
-
-  private void addStreamDeclarer(DataStreamDeclarer streamDeclarer) {
-    streamDeclarers.put(streamDeclarer.declareModel().getAppId(), streamDeclarer);
-    checkAndStartExecutableStreams(streamDeclarer);
+  private void addDataProcessor(IStreamPipesDataProcessor dataProcessor) {
+    dataProcessors.put(dataProcessor.declareConfig().getDescription().getAppId(), dataProcessor);
   }
 
-  private void addConsumerDeclarer(SemanticEventConsumerDeclarer consumerDeclarer) {
-    consumerDeclarers.put(consumerDeclarer.declareModel().getAppId(), consumerDeclarer);
+  private void addDataStream(IStreamPipesDataStream dataStream) {
+    dataStreams.put(dataStream.declareConfig().getDescription().getAppId(), dataStream);
+    checkAndStartExecutableStreams(dataStream);
   }
 
-  private void addPipelineTemplateDeclarer(PipelineTemplateDeclarer pipelineTemplateDeclarer) {
-    pipelineTemplateDeclarers.put(pipelineTemplateDeclarer.declareModel().getAppId(),
-        pipelineTemplateDeclarer);
+  private void addDataSink(IStreamPipesDataSink dataSink) {
+    dataSinks.put(dataSink.declareConfig().getDescription().getAppId(), dataSink);
   }
 
-  public Map<String, SemanticEventProcessingAgentDeclarer> getEpaDeclarers() {
-    return epaDeclarers;
+  public Map<String, IStreamPipesDataProcessor> getDataProcessors() {
+    return dataProcessors;
   }
 
-  public Map<String, DataStreamDeclarer> getStreamDeclarers() {
-    return streamDeclarers;
+  public Map<String, IStreamPipesDataStream> getDataStreams() {
+    return dataStreams;
   }
 
-  public Map<String, SemanticEventConsumerDeclarer> getConsumerDeclarers() {
-    return consumerDeclarers;
-  }
-
-  public Map<String, PipelineTemplateDeclarer> getPipelineTemplateDeclarers() {
-    return pipelineTemplateDeclarers;
+  public Map<String, IStreamPipesDataSink> getDataSinks() {
+    return dataSinks;
   }
 
   public Collection<TransportProtocol> getSupportedProtocols() {
@@ -273,7 +265,7 @@ public class DeclarersSingleton implements IDeclarersSingleton {
         .findFirst();
   }
 
-  private void checkAndStartExecutableStreams(DataStreamDeclarer declarer) {
+  private void checkAndStartExecutableStreams(IStreamPipesDataStream declarer) {
     if (declarer.isExecutable()) {
       declarer.executeStream();
     }
@@ -291,4 +283,8 @@ public class DeclarersSingleton implements IDeclarersSingleton {
   public SpServiceDefinition getServiceDefinition() {
     return this.serviceDefinition;
   }
+
+  public List<IStreamPipesRuntimeProvider> getRuntimeProviders() {
+    return runtimeProviders;
+  }
 }
diff --git a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/init/RunningInstances.java b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/init/RunningInstances.java
index 312b7d147..538043d7f 100644
--- a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/init/RunningInstances.java
+++ b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/init/RunningInstances.java
@@ -18,7 +18,7 @@
 
 package org.apache.streampipes.extensions.management.init;
 
-import org.apache.streampipes.extensions.api.declarer.InvocableDeclarer;
+import org.apache.streampipes.extensions.api.pe.runtime.IStreamPipesRuntime;
 import org.apache.streampipes.extensions.management.util.ElementInfo;
 import org.apache.streampipes.model.base.NamedStreamPipesEntity;
 
@@ -30,19 +30,22 @@ import java.util.Map;
 public enum RunningInstances {
   INSTANCE;
 
-  private final Map<String, ElementInfo<NamedStreamPipesEntity, InvocableDeclarer>> runningInstances = new HashMap<>();
+  private final Map<String,
+      ElementInfo<NamedStreamPipesEntity, IStreamPipesRuntime<?, ?>>> runningInstances = new HashMap<>();
 
 
-  public void add(String id, NamedStreamPipesEntity description, InvocableDeclarer invocation) {
-    runningInstances.put(id, new ElementInfo<>(description, invocation));
+  public void add(String id,
+                  NamedStreamPipesEntity description,
+                  IStreamPipesRuntime<?, ?> runtime) {
+    runningInstances.put(id, new ElementInfo<>(description, runtime));
   }
 
   public boolean exists(String runningInstanceId) {
     return runningInstances.containsKey(runningInstanceId);
   }
 
-  public InvocableDeclarer getInvocation(String id) {
-    ElementInfo<NamedStreamPipesEntity, InvocableDeclarer> result = runningInstances.get(id);
+  public IStreamPipesRuntime<?, ?> getInvocation(String id) {
+    ElementInfo<NamedStreamPipesEntity, IStreamPipesRuntime<?, ?>> result = runningInstances.get(id);
     if (result != null) {
       return result.getInvocation();
     } else {
diff --git a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/model/SpServiceDefinition.java b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/model/SpServiceDefinition.java
index 3f72e18b5..463ddaf37 100644
--- a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/model/SpServiceDefinition.java
+++ b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/model/SpServiceDefinition.java
@@ -19,8 +19,9 @@ package org.apache.streampipes.extensions.management.model;
 
 import org.apache.streampipes.dataformat.SpDataFormatFactory;
 import org.apache.streampipes.extensions.api.connect.StreamPipesAdapter;
-import org.apache.streampipes.extensions.api.declarer.Declarer;
 import org.apache.streampipes.extensions.api.declarer.IStreamPipesFunctionDeclarer;
+import org.apache.streampipes.extensions.api.pe.IStreamPipesPipelineElement;
+import org.apache.streampipes.extensions.api.pe.runtime.IStreamPipesRuntimeProvider;
 import org.apache.streampipes.messaging.SpProtocolDefinitionFactory;
 import org.apache.streampipes.svcdiscovery.api.model.ConfigItem;
 
@@ -38,7 +39,7 @@ public class SpServiceDefinition {
   private String serviceDescription;
   private Integer defaultPort;
 
-  private List<Declarer<?>> declarers;
+  private List<IStreamPipesPipelineElement<?>> pipelineElements;
   private List<SpDataFormatFactory> dataFormatFactories;
   private List<SpProtocolDefinitionFactory<?>> protocolDefinitionFactories;
   private List<IStreamPipesFunctionDeclarer> functions;
@@ -47,14 +48,17 @@ public class SpServiceDefinition {
 
   private Map<String, ConfigItem> kvConfigs;
 
+  private List<IStreamPipesRuntimeProvider> runtimeProviders;
+
   public SpServiceDefinition() {
     this.serviceId = UUID.randomUUID().toString();
-    this.declarers = new ArrayList<>();
+    this.pipelineElements = new ArrayList<>();
     this.dataFormatFactories = new ArrayList<>();
     this.protocolDefinitionFactories = new ArrayList<>();
     this.kvConfigs = new HashMap<>();
     this.functions = new ArrayList<>();
     this.adapters = new ArrayList<>();
+    this.runtimeProviders = new ArrayList<>();
   }
 
   public String getServiceGroup() {
@@ -97,20 +101,20 @@ public class SpServiceDefinition {
     this.defaultPort = defaultPort;
   }
 
-  public void addDeclarer(Declarer<?> declarer) {
-    this.declarers.add(declarer);
+  public void addDeclarer(IStreamPipesPipelineElement<?> pipelineElements) {
+    this.pipelineElements.add(pipelineElements);
   }
 
-  public void addDeclarers(List<Declarer<?>> declarers) {
-    this.declarers.addAll(declarers);
+  public void addDeclarers(List<IStreamPipesPipelineElement<?>> declarers) {
+    this.pipelineElements.addAll(declarers);
   }
 
-  public List<Declarer<?>> getDeclarers() {
-    return declarers;
+  public List<IStreamPipesPipelineElement<?>> getDeclarers() {
+    return pipelineElements;
   }
 
-  public void setDeclarers(List<Declarer<?>> declarers) {
-    this.declarers = declarers;
+  public void setDeclarers(List<IStreamPipesPipelineElement<?>> pipelineElements) {
+    this.pipelineElements = pipelineElements;
   }
 
   public void addDataFormatFactory(SpDataFormatFactory factory) {
@@ -172,4 +176,12 @@ public class SpServiceDefinition {
   public List<StreamPipesAdapter> getAdapters() {
     return adapters;
   }
+
+  public List<IStreamPipesRuntimeProvider> getRuntimeProviders() {
+    return runtimeProviders;
+  }
+
+  public void addRuntimeProvider(IStreamPipesRuntimeProvider runtimeProvider) {
+    this.runtimeProviders.add(runtimeProvider);
+  }
 }
diff --git a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/model/SpServiceDefinitionBuilder.java b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/model/SpServiceDefinitionBuilder.java
index 8e2892faf..76f640393 100644
--- a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/model/SpServiceDefinitionBuilder.java
+++ b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/model/SpServiceDefinitionBuilder.java
@@ -19,8 +19,9 @@ package org.apache.streampipes.extensions.management.model;
 
 import org.apache.streampipes.dataformat.SpDataFormatFactory;
 import org.apache.streampipes.extensions.api.connect.StreamPipesAdapter;
-import org.apache.streampipes.extensions.api.declarer.Declarer;
 import org.apache.streampipes.extensions.api.declarer.IStreamPipesFunctionDeclarer;
+import org.apache.streampipes.extensions.api.pe.IStreamPipesPipelineElement;
+import org.apache.streampipes.extensions.api.pe.runtime.IStreamPipesRuntimeProvider;
 import org.apache.streampipes.messaging.SpProtocolDefinitionFactory;
 import org.apache.streampipes.svcdiscovery.api.model.ConfigItem;
 
@@ -86,12 +87,12 @@ public class SpServiceDefinitionBuilder {
     return this;
   }
 
-  public SpServiceDefinitionBuilder registerPipelineElement(Declarer<?> declarer) {
-    this.serviceDefinition.addDeclarer(declarer);
+  public SpServiceDefinitionBuilder registerPipelineElement(IStreamPipesPipelineElement<?> pipelineElement) {
+    this.serviceDefinition.addDeclarer(pipelineElement);
     return this;
   }
 
-  public SpServiceDefinitionBuilder registerPipelineElements(Declarer<?>... declarers) {
+  public SpServiceDefinitionBuilder registerPipelineElements(IStreamPipesPipelineElement<?>... declarers) {
     this.serviceDefinition.addDeclarers(Arrays.asList(declarers));
     return this;
   }
@@ -140,6 +141,11 @@ public class SpServiceDefinitionBuilder {
     return this;
   }
 
+  public SpServiceDefinitionBuilder registerRuntimeProvider(IStreamPipesRuntimeProvider runtimeProvider) {
+    this.serviceDefinition.addRuntimeProvider(runtimeProvider);
+    return this;
+  }
+
   public SpServiceDefinition build() {
     return this.serviceDefinition;
   }
diff --git a/streampipes-sources/src/main/java/org/apache/streampipes/sources/AbstractAdapterIncludedStream.java b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/util/RuntimeContextUtils.java
similarity index 64%
copy from streampipes-sources/src/main/java/org/apache/streampipes/sources/AbstractAdapterIncludedStream.java
copy to streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/util/RuntimeContextUtils.java
index cb4560520..1823557b7 100644
--- a/streampipes-sources/src/main/java/org/apache/streampipes/sources/AbstractAdapterIncludedStream.java
+++ b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/util/RuntimeContextUtils.java
@@ -16,20 +16,21 @@
  *
  */
 
-package org.apache.streampipes.sources;
+package org.apache.streampipes.extensions.management.util;
 
-import org.apache.streampipes.extensions.api.declarer.DataStreamDeclarer;
+import org.apache.streampipes.client.StreamPipesClient;
+import org.apache.streampipes.extensions.management.client.StreamPipesClientResolver;
 import org.apache.streampipes.extensions.management.config.ConfigExtractor;
 import org.apache.streampipes.extensions.management.init.DeclarersSingleton;
 
-public abstract class AbstractAdapterIncludedStream implements DataStreamDeclarer {
+public class RuntimeContextUtils {
 
-  @Override
-  public boolean isExecutable() {
-    return true;
+  public static ConfigExtractor makeConfigExtractor() {
+    var serviceId = DeclarersSingleton.getInstance().getServiceId();
+    return ConfigExtractor.from(serviceId);
   }
 
-  public ConfigExtractor configExtractor() {
-    return ConfigExtractor.from(DeclarersSingleton.getInstance().getServiceDefinition().getServiceGroup());
+  public static StreamPipesClient makeStreamPipesClient() {
+    return new StreamPipesClientResolver().makeStreamPipesClientInstance();
   }
 }
diff --git a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/util/ServiceDefinitionUtil.java b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/util/ServiceDefinitionUtil.java
index 95e033b82..104e7a8b7 100644
--- a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/util/ServiceDefinitionUtil.java
+++ b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/util/ServiceDefinitionUtil.java
@@ -18,7 +18,7 @@
 package org.apache.streampipes.extensions.management.util;
 
 import org.apache.streampipes.extensions.api.connect.StreamPipesAdapter;
-import org.apache.streampipes.extensions.api.declarer.Declarer;
+import org.apache.streampipes.extensions.api.pe.IStreamPipesPipelineElement;
 import org.apache.streampipes.model.SpDataStream;
 import org.apache.streampipes.model.base.NamedStreamPipesEntity;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
@@ -32,10 +32,13 @@ import java.util.stream.Collectors;
 
 public class ServiceDefinitionUtil {
 
-  public static List<SpServiceTag> extractAppIds(Collection<Declarer<?>> declarers) {
+  public static List<SpServiceTag> extractAppIds(Collection<IStreamPipesPipelineElement<?>> declarers) {
     return declarers
         .stream()
-        .map(d -> SpServiceTag.create(getPrefix(d.declareModel()), d.declareModel().getAppId()))
+        .map(d -> {
+          var model = d.declareConfig().getDescription();
+          return SpServiceTag.create(getPrefix(model), model.getAppId());
+        })
         .collect(Collectors.toList());
   }
 
diff --git a/streampipes-extensions/streampipes-connectors-influx/src/main/java/org/apache/streampipes/extensions/connectors/influx/sink/InfluxDbSink.java b/streampipes-extensions/streampipes-connectors-influx/src/main/java/org/apache/streampipes/extensions/connectors/influx/sink/InfluxDbSink.java
index efb4121da..78946c810 100644
--- a/streampipes-extensions/streampipes-connectors-influx/src/main/java/org/apache/streampipes/extensions/connectors/influx/sink/InfluxDbSink.java
+++ b/streampipes-extensions/streampipes-connectors-influx/src/main/java/org/apache/streampipes/extensions/connectors/influx/sink/InfluxDbSink.java
@@ -19,6 +19,7 @@
 package org.apache.streampipes.extensions.connectors.influx.sink;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventSinkRuntimeContext;
 import org.apache.streampipes.extensions.connectors.influx.shared.InfluxConfigs;
 import org.apache.streampipes.logging.api.Logger;
 import org.apache.streampipes.model.DataSinkType;
@@ -31,8 +32,7 @@ import org.apache.streampipes.sdk.helpers.EpRequirements;
 import org.apache.streampipes.sdk.helpers.Labels;
 import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventSinkRuntimeContext;
-import org.apache.streampipes.wrapper.standalone.SinkParams;
+import org.apache.streampipes.wrapper.params.compat.SinkParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataSink;
 
 import static org.apache.streampipes.extensions.connectors.influx.shared.InfluxKeys.BATCH_INTERVAL_ACTIONS_KEY;
@@ -52,7 +52,7 @@ public class InfluxDbSink extends StreamPipesDataSink {
                            EventSinkRuntimeContext runtimeContext) throws SpRuntimeException {
 
     var extractor = parameters.extractor();
-    log = parameters.getGraph().getLogger(InfluxDbSink.class);
+    log = parameters.getModel().getLogger(InfluxDbSink.class);
 
     var connectionSettings = InfluxConfigs.fromExtractor(extractor);
     String measureName = extractor.singleValueParameter(DATABASE_MEASUREMENT_KEY, String.class);
diff --git a/streampipes-extensions/streampipes-extensions-all-jvm/pom.xml b/streampipes-extensions/streampipes-extensions-all-jvm/pom.xml
index ec8d54086..2315260b1 100644
--- a/streampipes-extensions/streampipes-extensions-all-jvm/pom.xml
+++ b/streampipes-extensions/streampipes-extensions-all-jvm/pom.xml
@@ -70,6 +70,13 @@
             <version>0.93.0-SNAPSHOT</version>
         </dependency>
 
+        
+        <dependency>
+            <groupId>org.apache.streampipes</groupId>
+            <artifactId>streampipes-wrapper-kafka-streams</artifactId>
+            <version>0.93.0-SNAPSHOT</version>
+        </dependency>
+
         <!-- Dependency convergence -->
         <dependency>
             <groupId>org.antlr</groupId>
diff --git a/streampipes-extensions/streampipes-extensions-all-jvm/src/main/java/org/apache/streampipes/extensions/all/jvm/AllExtensionsInit.java b/streampipes-extensions/streampipes-extensions-all-jvm/src/main/java/org/apache/streampipes/extensions/all/jvm/AllExtensionsInit.java
index 6c782b57e..a9913b975 100644
--- a/streampipes-extensions/streampipes-extensions-all-jvm/src/main/java/org/apache/streampipes/extensions/all/jvm/AllExtensionsInit.java
+++ b/streampipes-extensions/streampipes-extensions-all-jvm/src/main/java/org/apache/streampipes/extensions/all/jvm/AllExtensionsInit.java
@@ -30,6 +30,7 @@ import org.apache.streampipes.messaging.mqtt.SpMqttProtocolFactory;
 import org.apache.streampipes.messaging.nats.SpNatsProtocolFactory;
 import org.apache.streampipes.pe.jvm.AllPipelineElementsInit;
 import org.apache.streampipes.service.extensions.ExtensionsModelSubmitter;
+import org.apache.streampipes.wrapper.kafka.KafkaStreamRuntimeProvider;
 
 
 public class AllExtensionsInit extends ExtensionsModelSubmitter {
@@ -46,6 +47,7 @@ public class AllExtensionsInit extends ExtensionsModelSubmitter {
 //        .merge(new ConnectAdapterInit().provideServiceDefinition())
         .merge(new ConnectAdapterIiotInit().provideServiceDefinition())
         .merge(new AllPipelineElementsInit().provideServiceDefinition())
+        .registerRuntimeProvider(new KafkaStreamRuntimeProvider())
         .registerMessagingFormats(
             new JsonDataFormatFactory(),
             new CborDataFormatFactory(),
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/pom.xml b/streampipes-extensions/streampipes-processors-aggregation-flink/pom.xml
index 22a11b023..be9a2f4dd 100644
--- a/streampipes-extensions/streampipes-processors-aggregation-flink/pom.xml
+++ b/streampipes-extensions/streampipes-processors-aggregation-flink/pom.xml
@@ -55,7 +55,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-runtime_2.11</artifactId>
+            <artifactId>flink-runtime</artifactId>
         </dependency>
         <dependency>
             <groupId>org.scala-lang</groupId>
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/AbstractAggregationProgram.java b/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/AbstractAggregationProgram.java
deleted file mode 100644
index 1e254a6eb..000000000
--- a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/AbstractAggregationProgram.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.streampipes.processors.aggregation.flink;
-
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
-import org.apache.streampipes.processors.aggregation.flink.config.ConfigKeys;
-import org.apache.streampipes.svcdiscovery.api.SpConfig;
-import org.apache.streampipes.wrapper.flink.FlinkDataProcessorRuntime;
-import org.apache.streampipes.wrapper.flink.FlinkDeploymentConfig;
-import org.apache.streampipes.wrapper.params.binding.EventProcessorBindingParams;
-
-public abstract class AbstractAggregationProgram<T extends EventProcessorBindingParams>
-    extends FlinkDataProcessorRuntime<T> {
-
-  public AbstractAggregationProgram(T params,
-                                    ConfigExtractor configExtractor,
-                                    StreamPipesClient streamPipesClient) {
-    super(params, configExtractor, streamPipesClient);
-  }
-
-  @Override
-  protected FlinkDeploymentConfig getDeploymentConfig(ConfigExtractor configExtractor) {
-    SpConfig config = configExtractor.getConfig();
-    return new FlinkDeploymentConfig(config.getString(
-        ConfigKeys.FLINK_JAR_FILE_LOC),
-        config.getString(ConfigKeys.FLINK_HOST),
-        config.getInteger(ConfigKeys.FLINK_PORT),
-        config.getBoolean(ConfigKeys.DEBUG)
-    );
-  }
-
-}
-
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/aggregation/AggregationController.java b/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/aggregation/AggregationController.java
index 29a4ad3d5..34c6dbe38 100644
--- a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/aggregation/AggregationController.java
+++ b/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/aggregation/AggregationController.java
@@ -18,10 +18,8 @@
 
 package org.apache.streampipes.processors.aggregation.flink.processor.aggregation;
 
-import org.apache.streampipes.client.StreamPipesClient;
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
 import org.apache.streampipes.extensions.api.runtime.ResolvesContainerProvidedOutputStrategy;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
@@ -45,7 +43,7 @@ import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.sdk.utils.Datatypes;
 import org.apache.streampipes.vocabulary.SO;
 import org.apache.streampipes.wrapper.flink.FlinkDataProcessorDeclarer;
-import org.apache.streampipes.wrapper.flink.FlinkDataProcessorRuntime;
+import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
 
 import org.apache.commons.lang3.StringUtils;
 
@@ -103,10 +101,8 @@ public class AggregationController extends FlinkDataProcessorDeclarer<Aggregatio
   }
 
   @Override
-  public FlinkDataProcessorRuntime<AggregationParameters> getRuntime(DataProcessorInvocation graph,
-                                                                     ProcessingElementParameterExtractor extractor,
-                                                                     ConfigExtractor configExtractor,
-                                                                     StreamPipesClient streamPipesClient) {
+  public FlinkDataProcessorProgram<AggregationParameters> getProgram(DataProcessorInvocation graph,
+                                                                     ProcessingElementParameterExtractor extractor) {
 
     List<String> groupBy = extractor.mappingPropertyValues("groupBy");
 
@@ -139,7 +135,7 @@ public class AggregationController extends FlinkDataProcessorDeclarer<Aggregatio
         selectProperties,
         timeCountWindow.equals(TIME_WINDOW_OPTION));
 
-    return new AggregationProgram(staticParam, configExtractor, streamPipesClient);
+    return new AggregationProgram(staticParam);
   }
 
   @Override
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/aggregation/AggregationParameters.java b/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/aggregation/AggregationParameters.java
index 6514bcfe1..6f11602a5 100644
--- a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/aggregation/AggregationParameters.java
+++ b/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/aggregation/AggregationParameters.java
@@ -19,11 +19,11 @@
 package org.apache.streampipes.processors.aggregation.flink.processor.aggregation;
 
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
-import org.apache.streampipes.wrapper.params.binding.EventProcessorBindingParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 
 import java.util.List;
 
-public class AggregationParameters extends EventProcessorBindingParams {
+public class AggregationParameters extends ProcessorParams {
 
   // timeWindow (true) or countWindow (false)
   private boolean timeWindow;
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/aggregation/AggregationProgram.java b/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/aggregation/AggregationProgram.java
index b74783a23..6cab6c5b7 100644
--- a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/aggregation/AggregationProgram.java
+++ b/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/aggregation/AggregationProgram.java
@@ -18,13 +18,10 @@
 
 package org.apache.streampipes.processors.aggregation.flink.processor.aggregation;
 
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
 import org.apache.streampipes.model.runtime.Event;
-import org.apache.streampipes.processors.aggregation.flink.AbstractAggregationProgram;
+import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
 
 import org.apache.flink.api.java.functions.KeySelector;
-import org.apache.flink.streaming.api.TimeCharacteristic;
 import org.apache.flink.streaming.api.datastream.DataStream;
 import org.apache.flink.streaming.api.datastream.KeyedStream;
 import org.apache.flink.streaming.api.windowing.assigners.SlidingEventTimeWindows;
@@ -34,50 +31,48 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class AggregationProgram extends AbstractAggregationProgram<AggregationParameters> {
+public class AggregationProgram extends FlinkDataProcessorProgram<AggregationParameters> {
 
-  public AggregationProgram(AggregationParameters params,
-                            ConfigExtractor configExtractor,
-                            StreamPipesClient streamPipesClient) {
-    super(params, configExtractor, streamPipesClient);
-    setStreamTimeCharacteristic(TimeCharacteristic.IngestionTime);
+  public AggregationProgram(AggregationParameters params) {
+    super(params);
+    //setStreamTimeCharacteristic(TimeCharacteristic.IngestionTime);
   }
 
   @Override
-  protected DataStream<Event> getApplicationLogic(DataStream<Event>... dataStreams) {
+  public DataStream<Event> getApplicationLogic(DataStream<Event>... dataStreams) {
     return getKeyedStream(dataStreams[0]);
   }
 
   private DataStream<Event> getKeyedStream(DataStream<Event> dataStream) {
-    if (bindingParams.getGroupBy().size() > 0) {
+    if (params.getGroupBy().size() > 0) {
       KeyedStream<Event, Map<String, String>> keyedStream = dataStream.keyBy(getKeySelector());
-      if (bindingParams.getTimeWindow()) {
+      if (params.getTimeWindow()) {
         return keyedStream
-            .window(SlidingEventTimeWindows.of(Time.seconds(bindingParams.getWindowSize()),
-                Time.seconds(bindingParams.getOutputEvery())))
-            .apply(new TimeAggregation(bindingParams.getAggregationType(), bindingParams.getAggregateKeyList(),
-                bindingParams.getGroupBy()));
+            .window(SlidingEventTimeWindows.of(Time.seconds(params.getWindowSize()),
+                Time.seconds(params.getOutputEvery())))
+            .apply(new TimeAggregation(params.getAggregationType(), params.getAggregateKeyList(),
+                params.getGroupBy()));
       } else {
         return keyedStream
-            .countWindow(bindingParams.getWindowSize(), bindingParams.getOutputEvery())
-            .apply(new CountAggregation(bindingParams.getAggregationType(), bindingParams.getAggregateKeyList(),
-                bindingParams.getGroupBy()));
+            .countWindow(params.getWindowSize(), params.getOutputEvery())
+            .apply(new CountAggregation(params.getAggregationType(), params.getAggregateKeyList(),
+                params.getGroupBy()));
       }
     } else {
-      if (bindingParams.getTimeWindow()) {
+      if (params.getTimeWindow()) {
         return dataStream
-            .timeWindowAll(Time.seconds(bindingParams.getWindowSize()), Time.seconds(bindingParams.getOutputEvery()))
-            .apply(new TimeAggregation(bindingParams.getAggregationType(), bindingParams.getAggregateKeyList()));
+            .timeWindowAll(Time.seconds(params.getWindowSize()), Time.seconds(params.getOutputEvery()))
+            .apply(new TimeAggregation(params.getAggregationType(), params.getAggregateKeyList()));
       } else {
         return dataStream
-            .countWindowAll(bindingParams.getWindowSize(), bindingParams.getOutputEvery())
-            .apply(new CountAggregation(bindingParams.getAggregationType(), bindingParams.getAggregateKeyList()));
+            .countWindowAll(params.getWindowSize(), params.getOutputEvery())
+            .apply(new CountAggregation(params.getAggregationType(), params.getAggregateKeyList()));
       }
     }
   }
 
   private KeySelector<Event, Map<String, String>> getKeySelector() {
-    List<String> groupBy = bindingParams.getGroupBy();
+    List<String> groupBy = params.getGroupBy();
     return new KeySelector<Event, Map<String, String>>() {
       @Override
       public Map<String, String> getKey(Event event) throws Exception {
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/count/CountController.java b/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/count/CountController.java
index 3b4e9a44b..0e6dc844e 100644
--- a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/count/CountController.java
+++ b/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/count/CountController.java
@@ -18,8 +18,6 @@
 
 package org.apache.streampipes.processors.aggregation.flink.processor.count;
 
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
@@ -36,7 +34,7 @@ import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.helpers.Tuple2;
 import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.wrapper.flink.FlinkDataProcessorDeclarer;
-import org.apache.streampipes.wrapper.flink.FlinkDataProcessorRuntime;
+import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
 
 public class CountController extends FlinkDataProcessorDeclarer<CountParameters> {
 
@@ -72,10 +70,8 @@ public class CountController extends FlinkDataProcessorDeclarer<CountParameters>
   }
 
   @Override
-  public FlinkDataProcessorRuntime<CountParameters> getRuntime(DataProcessorInvocation graph,
-                                                               ProcessingElementParameterExtractor extractor,
-                                                               ConfigExtractor configExtractor,
-                                                               StreamPipesClient streamPipesClient) {
+  public FlinkDataProcessorProgram<CountParameters> getProgram(DataProcessorInvocation graph,
+                                                               ProcessingElementParameterExtractor extractor) {
 
     Integer timeWindowSize = extractor.singleValueParameter(TIME_WINDOW_KEY, Integer.class);
     String scale = extractor.selectedSingleValueInternalName(SCALE_KEY, String.class);
@@ -84,7 +80,7 @@ public class CountController extends FlinkDataProcessorDeclarer<CountParameters>
     CountParameters staticParam = new CountParameters(graph, timeWindowSize, scale,
         fieldToCount);
 
-    return new CountProgram(staticParam, configExtractor, streamPipesClient);
+    return new CountProgram(staticParam);
 
   }
 }
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/count/CountParameters.java b/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/count/CountParameters.java
index c8ab3d5e8..cf1ece238 100644
--- a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/count/CountParameters.java
+++ b/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/count/CountParameters.java
@@ -19,9 +19,9 @@
 package org.apache.streampipes.processors.aggregation.flink.processor.count;
 
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
-import org.apache.streampipes.wrapper.params.binding.EventProcessorBindingParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 
-public class CountParameters extends EventProcessorBindingParams {
+public class CountParameters extends ProcessorParams {
 
   private Integer timeWindowSize;
   private String timeWindowScale;
@@ -47,4 +47,4 @@ public class CountParameters extends EventProcessorBindingParams {
   public String getFieldToCount() {
     return fieldToCount;
   }
-}
\ No newline at end of file
+}
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/count/CountProgram.java b/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/count/CountProgram.java
index 6a20cd503..90ceed3fe 100644
--- a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/count/CountProgram.java
+++ b/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/count/CountProgram.java
@@ -17,31 +17,26 @@
  */
 package org.apache.streampipes.processors.aggregation.flink.processor.count;
 
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
 import org.apache.streampipes.model.runtime.Event;
-import org.apache.streampipes.processors.aggregation.flink.AbstractAggregationProgram;
+import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
 
 import org.apache.flink.streaming.api.TimeCharacteristic;
 import org.apache.flink.streaming.api.datastream.DataStream;
 import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
 
-public class CountProgram extends AbstractAggregationProgram<CountParameters> {
+public class CountProgram extends FlinkDataProcessorProgram<CountParameters> {
 
-  public CountProgram(CountParameters params,
-                      ConfigExtractor configExtractor,
-                      StreamPipesClient streamPipesClient) {
-    super(params, configExtractor, streamPipesClient);
-    setStreamTimeCharacteristic(TimeCharacteristic.IngestionTime);
+  public CountProgram(CountParameters params) {
+    super(params);
   }
 
   @Override
-  protected DataStream<Event> getApplicationLogic(DataStream<Event>... dataStreams) {
+  public DataStream<Event> getApplicationLogic(DataStream<Event>... dataStreams) {
     return dataStreams[0]
-        .map(new CountMapper(bindingParams.getFieldToCount()))
+        .map(new CountMapper(params.getFieldToCount()))
         .keyBy(1)
-        .timeWindow(new TimeWindowConverter().makeTimeWindow(bindingParams.getTimeWindowSize(),
-            bindingParams.getTimeWindowScale()))
+        .timeWindow(new TimeWindowConverter().makeTimeWindow(params.getTimeWindowSize(),
+            params.getTimeWindowScale()))
         .trigger(new CountTrigger())
         .sum(2)
         .map(new Tuple2MapMapper());
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/eventcount/EventCountController.java b/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/eventcount/EventCountController.java
index a592698df..0336a8b43 100644
--- a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/eventcount/EventCountController.java
+++ b/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/eventcount/EventCountController.java
@@ -17,8 +17,6 @@
  */
 package org.apache.streampipes.processors.aggregation.flink.processor.eventcount;
 
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
@@ -34,7 +32,7 @@ import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.helpers.Tuple2;
 import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.wrapper.flink.FlinkDataProcessorDeclarer;
-import org.apache.streampipes.wrapper.flink.FlinkDataProcessorRuntime;
+import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
 
 public class EventCountController extends FlinkDataProcessorDeclarer<EventCountParameters> {
 
@@ -68,14 +66,12 @@ public class EventCountController extends FlinkDataProcessorDeclarer<EventCountP
   }
 
   @Override
-  public FlinkDataProcessorRuntime<EventCountParameters> getRuntime(DataProcessorInvocation graph,
-                                                                    ProcessingElementParameterExtractor extractor,
-                                                                    ConfigExtractor configExtractor,
-                                                                    StreamPipesClient streamPipesClient) {
+  public FlinkDataProcessorProgram<EventCountParameters> getProgram(DataProcessorInvocation graph,
+                                                                    ProcessingElementParameterExtractor extractor) {
     Integer timeWindowSize = extractor.singleValueParameter(TIME_WINDOW_KEY, Integer.class);
     String scale = extractor.selectedSingleValueInternalName(SCALE_KEY, String.class);
     EventCountParameters staticParam = new EventCountParameters(graph, timeWindowSize, scale);
 
-    return new EventCountProgram(staticParam, configExtractor, streamPipesClient);
+    return new EventCountProgram(staticParam);
   }
 }
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/eventcount/EventCountParameters.java b/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/eventcount/EventCountParameters.java
index 7d614e40b..8d4bd0f8e 100644
--- a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/eventcount/EventCountParameters.java
+++ b/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/eventcount/EventCountParameters.java
@@ -18,9 +18,9 @@
 package org.apache.streampipes.processors.aggregation.flink.processor.eventcount;
 
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
-import org.apache.streampipes.wrapper.params.binding.EventProcessorBindingParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 
-public class EventCountParameters extends EventProcessorBindingParams {
+public class EventCountParameters extends ProcessorParams {
 
   private Integer timeWindowSize;
   private String timeWindowScale;
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/eventcount/EventCountProgram.java b/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/eventcount/EventCountProgram.java
index dac8b9195..c4682ab1a 100644
--- a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/eventcount/EventCountProgram.java
+++ b/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/eventcount/EventCountProgram.java
@@ -17,28 +17,24 @@
  */
 package org.apache.streampipes.processors.aggregation.flink.processor.eventcount;
 
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
 import org.apache.streampipes.model.runtime.Event;
-import org.apache.streampipes.processors.aggregation.flink.AbstractAggregationProgram;
 import org.apache.streampipes.processors.aggregation.flink.processor.count.TimeWindowConverter;
+import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
 
 import org.apache.flink.streaming.api.datastream.DataStream;
 
-public class EventCountProgram extends AbstractAggregationProgram<EventCountParameters> {
+public class EventCountProgram extends FlinkDataProcessorProgram<EventCountParameters> {
 
-  public EventCountProgram(EventCountParameters params,
-                           ConfigExtractor configExtractor,
-                           StreamPipesClient streamPipesClient) {
-    super(params, configExtractor, streamPipesClient);
+  public EventCountProgram(EventCountParameters params) {
+    super(params);
   }
 
   @Override
-  protected DataStream<Event> getApplicationLogic(DataStream<Event>... dataStreams) {
+  public DataStream<Event> getApplicationLogic(DataStream<Event>... dataStreams) {
     return dataStreams[0]
         .map(new EventCountMapper())
-        .timeWindowAll(new TimeWindowConverter().makeTimeWindow(bindingParams.getTimeWindowSize(),
-            bindingParams.getTimeWindowScale()))
+        .timeWindowAll(new TimeWindowConverter().makeTimeWindow(params.getTimeWindowSize(),
+            params.getTimeWindowScale()))
         .sum(0)
         .map(new EventCountOutputMapper());
   }
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/rate/EventRate.java b/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/rate/EventRate.java
index acff08858..443efc5d4 100644
--- a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/rate/EventRate.java
+++ b/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/rate/EventRate.java
@@ -19,7 +19,7 @@ package org.apache.streampipes.processors.aggregation.flink.processor.rate;
 
 import org.apache.streampipes.model.runtime.Event;
 
-import org.apache.flink.shaded.guava18.com.google.common.collect.Iterables;
+import org.apache.flink.shaded.curator5.com.google.common.collect.Iterables;
 import org.apache.flink.streaming.api.functions.windowing.AllWindowFunction;
 import org.apache.flink.streaming.api.windowing.windows.TimeWindow;
 import org.apache.flink.util.Collector;
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/rate/EventRateController.java b/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/rate/EventRateController.java
index 53ba08f3c..ee269f901 100644
--- a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/rate/EventRateController.java
+++ b/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/rate/EventRateController.java
@@ -18,8 +18,6 @@
 
 package org.apache.streampipes.processors.aggregation.flink.processor.rate;
 
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
@@ -33,7 +31,7 @@ import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.wrapper.flink.FlinkDataProcessorDeclarer;
-import org.apache.streampipes.wrapper.flink.FlinkDataProcessorRuntime;
+import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
 
 public class EventRateController extends FlinkDataProcessorDeclarer<EventRateParameter> {
 
@@ -57,15 +55,13 @@ public class EventRateController extends FlinkDataProcessorDeclarer<EventRatePar
   }
 
   @Override
-  public FlinkDataProcessorRuntime<EventRateParameter> getRuntime(DataProcessorInvocation graph,
-                                                                  ProcessingElementParameterExtractor extractor,
-                                                                  ConfigExtractor configExtractor,
-                                                                  StreamPipesClient streamPipesClient) {
+  public FlinkDataProcessorProgram<EventRateParameter> getProgram(DataProcessorInvocation graph,
+                                                                  ProcessingElementParameterExtractor extractor) {
     Integer avgRate = extractor.singleValueParameter(RATE_KEY, Integer.class);
 
     EventRateParameter staticParam = new EventRateParameter(graph, avgRate);
 
-    return new EventRateProgram(staticParam, configExtractor, streamPipesClient);
+    return new EventRateProgram(staticParam);
 
   }
 }
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/rate/EventRateParameter.java b/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/rate/EventRateParameter.java
index 499bce071..011e712d9 100644
--- a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/rate/EventRateParameter.java
+++ b/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/rate/EventRateParameter.java
@@ -19,9 +19,9 @@
 package org.apache.streampipes.processors.aggregation.flink.processor.rate;
 
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
-import org.apache.streampipes.wrapper.params.binding.EventProcessorBindingParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 
-public class EventRateParameter extends EventProcessorBindingParams {
+public class EventRateParameter extends ProcessorParams {
 
   private Integer avgRate;
 
diff --git a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/rate/EventRateProgram.java b/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/rate/EventRateProgram.java
index 62afedde5..720486a13 100644
--- a/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/rate/EventRateProgram.java
+++ b/streampipes-extensions/streampipes-processors-aggregation-flink/src/main/java/org/apache/streampipes/processors/aggregation/flink/processor/rate/EventRateProgram.java
@@ -17,28 +17,24 @@
  */
 package org.apache.streampipes.processors.aggregation.flink.processor.rate;
 
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
 import org.apache.streampipes.model.runtime.Event;
-import org.apache.streampipes.processors.aggregation.flink.AbstractAggregationProgram;
+import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
 
 import org.apache.flink.api.common.functions.FlatMapFunction;
-import org.apache.flink.streaming.api.TimeCharacteristic;
 import org.apache.flink.streaming.api.datastream.DataStream;
 import org.apache.flink.streaming.api.windowing.time.Time;
 import org.apache.flink.util.Collector;
 
 
-public class EventRateProgram extends AbstractAggregationProgram<EventRateParameter> {
+public class EventRateProgram extends FlinkDataProcessorProgram<EventRateParameter> {
 
-  public EventRateProgram(EventRateParameter params, ConfigExtractor configExtractor,
-                          StreamPipesClient streamPipesClient) {
-    super(params, configExtractor, streamPipesClient);
-    setStreamTimeCharacteristic(TimeCharacteristic.IngestionTime);
+  public EventRateProgram(EventRateParameter params) {
+    super(params);
+    //setStreamTimeCharacteristic(TimeCharacteristic.IngestionTime);
   }
 
   @Override
-  protected DataStream<Event> getApplicationLogic(DataStream<Event>... dataStreams) {
+  public DataStream<Event> getApplicationLogic(DataStream<Event>... dataStreams) {
     return dataStreams[0].timeWindowAll(Time.seconds(params.getAvgRate())).apply(new EventRate(params.getAvgRate()))
         .flatMap(new FlatMapFunction<Float, Event>() {
           @Override
diff --git a/streampipes-extensions/streampipes-processors-change-detection-jvm/src/main/java/org/apache/streampipes/processors/changedetection/jvm/welford/WelfordChangeDetection.java b/streampipes-extensions/streampipes-processors-change-detection-jvm/src/main/java/org/apache/streampipes/processors/changedetection/jvm/welford/WelfordChangeDetection.java
index 58015cc50..d300b8b2c 100644
--- a/streampipes-extensions/streampipes-processors-change-detection-jvm/src/main/java/org/apache/streampipes/processors/changedetection/jvm/welford/WelfordChangeDetection.java
+++ b/streampipes-extensions/streampipes-processors-change-detection-jvm/src/main/java/org/apache/streampipes/processors/changedetection/jvm/welford/WelfordChangeDetection.java
@@ -18,6 +18,8 @@
 package org.apache.streampipes.processors.changedetection.jvm.welford;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -32,9 +34,7 @@ import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.vocabulary.SO;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import java.util.Arrays;
diff --git a/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/AbstractEnricherProgram.java b/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/AbstractEnricherProgram.java
deleted file mode 100644
index e418660ed..000000000
--- a/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/AbstractEnricherProgram.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.streampipes.processors.enricher.flink;
-
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
-import org.apache.streampipes.processors.enricher.flink.config.ConfigKeys;
-import org.apache.streampipes.svcdiscovery.api.SpConfig;
-import org.apache.streampipes.wrapper.flink.FlinkDataProcessorRuntime;
-import org.apache.streampipes.wrapper.flink.FlinkDeploymentConfig;
-import org.apache.streampipes.wrapper.params.binding.EventProcessorBindingParams;
-
-public abstract class AbstractEnricherProgram<T extends EventProcessorBindingParams>
-    extends FlinkDataProcessorRuntime<T> {
-
-  public AbstractEnricherProgram(T params,
-                                 ConfigExtractor configExtractor,
-                                 StreamPipesClient streamPipesClient) {
-    super(params, configExtractor, streamPipesClient);
-  }
-
-  @Override
-  protected FlinkDeploymentConfig getDeploymentConfig(ConfigExtractor configExtractor) {
-    SpConfig config = configExtractor.getConfig();
-    return new FlinkDeploymentConfig(config.getString(
-        ConfigKeys.FLINK_JAR_FILE_LOC),
-        config.getString(ConfigKeys.FLINK_HOST),
-        config.getInteger(ConfigKeys.FLINK_PORT),
-        config.getBoolean(ConfigKeys.DEBUG)
-    );
-  }
-
-}
-
diff --git a/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/EnricherFlinkInit.java b/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/EnricherFlinkInit.java
index db55e09a7..84aa6d357 100644
--- a/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/EnricherFlinkInit.java
+++ b/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/EnricherFlinkInit.java
@@ -31,6 +31,7 @@ import org.apache.streampipes.processors.enricher.flink.config.ConfigKeys;
 import org.apache.streampipes.processors.enricher.flink.processor.timestamp.TimestampController;
 import org.apache.streampipes.processors.enricher.flink.processor.urldereferencing.UrlDereferencingController;
 import org.apache.streampipes.service.extensions.ExtensionsModelSubmitter;
+import org.apache.streampipes.wrapper.flink.FlinkRuntimeProvider;
 
 public class EnricherFlinkInit extends ExtensionsModelSubmitter {
 
@@ -44,8 +45,10 @@ public class EnricherFlinkInit extends ExtensionsModelSubmitter {
             "Processors Enricher Flink",
             "",
             8090)
-        .registerPipelineElements(new TimestampController(),
+        .registerPipelineElements(
+            new TimestampController(),
             new UrlDereferencingController())
+        .registerRuntimeProvider(new FlinkRuntimeProvider())
         .registerMessagingFormats(
             new JsonDataFormatFactory(),
             new CborDataFormatFactory(),
diff --git a/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/timestamp/TimestampController.java b/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/timestamp/TimestampController.java
index af7a83d5b..d46d1e8cc 100644
--- a/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/timestamp/TimestampController.java
+++ b/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/timestamp/TimestampController.java
@@ -18,8 +18,6 @@
 
 package org.apache.streampipes.processors.enricher.flink.processor.timestamp;
 
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
 import org.apache.streampipes.sdk.builder.ProcessingElementBuilder;
@@ -33,7 +31,7 @@ import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.vocabulary.SO;
 import org.apache.streampipes.wrapper.flink.FlinkDataProcessorDeclarer;
-import org.apache.streampipes.wrapper.flink.FlinkDataProcessorRuntime;
+import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
 
 public class TimestampController extends FlinkDataProcessorDeclarer<TimestampParameters> {
 
@@ -54,17 +52,15 @@ public class TimestampController extends FlinkDataProcessorDeclarer<TimestampPar
   }
 
   @Override
-  public FlinkDataProcessorRuntime<TimestampParameters> getRuntime(DataProcessorInvocation graph,
-                                                                   ProcessingElementParameterExtractor extractor,
-                                                                   ConfigExtractor configExtractor,
-                                                                   StreamPipesClient streamPipesClient) {
+  public FlinkDataProcessorProgram<TimestampParameters> getProgram(DataProcessorInvocation graph,
+                                                                   ProcessingElementParameterExtractor extractor) {
 
     TimestampParameters staticParam = new TimestampParameters(
         graph,
         APPEND_PROPERTY);
 
 
-    return new TimestampProgram(staticParam, configExtractor, streamPipesClient);
+    return new TimestampProgram(staticParam);
   }
 
 }
diff --git a/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/timestamp/TimestampParameters.java b/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/timestamp/TimestampParameters.java
index d4439efc6..1f25db0ab 100644
--- a/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/timestamp/TimestampParameters.java
+++ b/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/timestamp/TimestampParameters.java
@@ -19,9 +19,9 @@
 package org.apache.streampipes.processors.enricher.flink.processor.timestamp;
 
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
-import org.apache.streampipes.wrapper.params.binding.EventProcessorBindingParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 
-public class TimestampParameters extends EventProcessorBindingParams {
+public class TimestampParameters extends ProcessorParams {
 
   private String appendTimePropertyName;
 
diff --git a/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/timestamp/TimestampProgram.java b/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/timestamp/TimestampProgram.java
index 253e34a22..b46df3ff0 100644
--- a/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/timestamp/TimestampProgram.java
+++ b/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/timestamp/TimestampProgram.java
@@ -18,25 +18,20 @@
 
 package org.apache.streampipes.processors.enricher.flink.processor.timestamp;
 
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
 import org.apache.streampipes.model.runtime.Event;
-import org.apache.streampipes.processors.enricher.flink.AbstractEnricherProgram;
+import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
 
 import org.apache.flink.streaming.api.datastream.DataStream;
 
-public class TimestampProgram extends AbstractEnricherProgram<TimestampParameters> {
+public class TimestampProgram extends FlinkDataProcessorProgram<TimestampParameters> {
 
-  public TimestampProgram(TimestampParameters params,
-                          ConfigExtractor configExtractor,
-                          StreamPipesClient streamPipesClient) {
-    super(params, configExtractor, streamPipesClient);
+  public TimestampProgram(TimestampParameters params) {
+    super(params);
   }
 
   @Override
-  protected DataStream<Event> getApplicationLogic(DataStream<Event>... messageStream) {
+  public DataStream<Event> getApplicationLogic(DataStream<Event>... messageStream) {
     return messageStream[0]
         .flatMap(new TimestampEnricher(params.getAppendTimePropertyName()));
   }
-
 }
diff --git a/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/urldereferencing/UrlDereferencingController.java b/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/urldereferencing/UrlDereferencingController.java
index fb7832840..f5f3437d1 100644
--- a/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/urldereferencing/UrlDereferencingController.java
+++ b/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/urldereferencing/UrlDereferencingController.java
@@ -18,8 +18,6 @@
 
 package org.apache.streampipes.processors.enricher.flink.processor.urldereferencing;
 
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
@@ -35,7 +33,7 @@ import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.vocabulary.SO;
 import org.apache.streampipes.wrapper.flink.FlinkDataProcessorDeclarer;
-import org.apache.streampipes.wrapper.flink.FlinkDataProcessorRuntime;
+import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
 
 public class UrlDereferencingController extends FlinkDataProcessorDeclarer<UrlDereferencingParameter> {
 
@@ -63,22 +61,11 @@ public class UrlDereferencingController extends FlinkDataProcessorDeclarer<UrlDe
 
 
   @Override
-  public FlinkDataProcessorRuntime<UrlDereferencingParameter> getRuntime(DataProcessorInvocation graph,
-                                                                         ProcessingElementParameterExtractor extractor,
-                                                                         ConfigExtractor configExtractor,
-                                                                         StreamPipesClient streamPipesClient) {
-    String urlString = extractor.mappingPropertyValue(URL);
-
-//        java.net.URL url = null;
-/*        try {
-             url = new URL(urlString);
-        } catch (MalformedURLException e) {
-            logger.error("Malformed URL:" + urlString);
-            throw new IllegalArgumentException("Malformed URL:" + urlString);
-        }
-*/
+  public FlinkDataProcessorProgram<UrlDereferencingParameter> getProgram(DataProcessorInvocation graph,
+                                                                         ProcessingElementParameterExtractor ex) {
+    String urlString = ex.mappingPropertyValue(URL);
     UrlDereferencingParameter staticParam = new UrlDereferencingParameter(graph, urlString, APPEND_HTML);
 
-    return new UrlDereferencingProgram(staticParam, configExtractor, streamPipesClient);
+    return new UrlDereferencingProgram(staticParam);
   }
 }
diff --git a/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/urldereferencing/UrlDereferencingParameter.java b/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/urldereferencing/UrlDereferencingParameter.java
index 755551706..f2c509a89 100644
--- a/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/urldereferencing/UrlDereferencingParameter.java
+++ b/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/urldereferencing/UrlDereferencingParameter.java
@@ -19,9 +19,9 @@
 package org.apache.streampipes.processors.enricher.flink.processor.urldereferencing;
 
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
-import org.apache.streampipes.wrapper.params.binding.EventProcessorBindingParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 
-public class UrlDereferencingParameter extends EventProcessorBindingParams {
+public class UrlDereferencingParameter extends ProcessorParams {
 
   private String urlString;
   private String appendHtml;
diff --git a/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/urldereferencing/UrlDereferencingProgram.java b/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/urldereferencing/UrlDereferencingProgram.java
index 6d1d1f45b..4bf504000 100644
--- a/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/urldereferencing/UrlDereferencingProgram.java
+++ b/streampipes-extensions/streampipes-processors-enricher-flink/src/main/java/org/apache/streampipes/processors/enricher/flink/processor/urldereferencing/UrlDereferencingProgram.java
@@ -18,23 +18,19 @@
 
 package org.apache.streampipes.processors.enricher.flink.processor.urldereferencing;
 
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
 import org.apache.streampipes.model.runtime.Event;
-import org.apache.streampipes.processors.enricher.flink.AbstractEnricherProgram;
+import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
 
 import org.apache.flink.streaming.api.datastream.DataStream;
 
-public class UrlDereferencingProgram extends AbstractEnricherProgram<UrlDereferencingParameter> {
+public class UrlDereferencingProgram extends FlinkDataProcessorProgram<UrlDereferencingParameter> {
 
-  public UrlDereferencingProgram(UrlDereferencingParameter params,
-                                 ConfigExtractor configExtractor,
-                                 StreamPipesClient streamPipesClient) {
-    super(params, configExtractor, streamPipesClient);
+  public UrlDereferencingProgram(UrlDereferencingParameter params) {
+    super(params);
   }
 
   @Override
-  protected DataStream<Event> getApplicationLogic(DataStream<Event>... dataStreams) {
+  public DataStream<Event> getApplicationLogic(DataStream<Event>... dataStreams) {
     return dataStreams[0]
         .flatMap(new UrlDereferencing(params.getUrl(), params.getAppendHtml(), params.getGraph()));
   }
diff --git a/streampipes-extensions/streampipes-processors-enricher-jvm/src/main/java/org/apache/streampipes/processors/enricher/jvm/processor/jseval/JSEvalProcessor.java b/streampipes-extensions/streampipes-processors-enricher-jvm/src/main/java/org/apache/streampipes/processors/enricher/jvm/processor/jseval/JSEvalProcessor.java
index fe7c6e007..87bda348f 100644
--- a/streampipes-extensions/streampipes-processors-enricher-jvm/src/main/java/org/apache/streampipes/processors/enricher/jvm/processor/jseval/JSEvalProcessor.java
+++ b/streampipes-extensions/streampipes-processors-enricher-jvm/src/main/java/org/apache/streampipes/processors/enricher/jvm/processor/jseval/JSEvalProcessor.java
@@ -18,6 +18,8 @@
 package org.apache.streampipes.processors.enricher.jvm.processor.jseval;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -29,9 +31,7 @@ import org.apache.streampipes.sdk.helpers.Labels;
 import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import org.graalvm.polyglot.Context;
diff --git a/streampipes-extensions/streampipes-processors-enricher-jvm/src/main/java/org/apache/streampipes/processors/enricher/jvm/processor/math/MathOpProcessor.java b/streampipes-extensions/streampipes-processors-enricher-jvm/src/main/java/org/apache/streampipes/processors/enricher/jvm/processor/math/MathOpProcessor.java
index 430d81b9d..914e3c187 100644
--- a/streampipes-extensions/streampipes-processors-enricher-jvm/src/main/java/org/apache/streampipes/processors/enricher/jvm/processor/math/MathOpProcessor.java
+++ b/streampipes-extensions/streampipes-processors-enricher-jvm/src/main/java/org/apache/streampipes/processors/enricher/jvm/processor/math/MathOpProcessor.java
@@ -20,6 +20,8 @@
 package org.apache.streampipes.processors.enricher.jvm.processor.math;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -40,9 +42,7 @@ import org.apache.streampipes.sdk.helpers.Options;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.vocabulary.SO;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 public class MathOpProcessor extends StreamPipesDataProcessor {
diff --git a/streampipes-extensions/streampipes-processors-enricher-jvm/src/main/java/org/apache/streampipes/processors/enricher/jvm/processor/math/staticmathop/StaticMathOpProcessor.java b/streampipes-extensions/streampipes-processors-enricher-jvm/src/main/java/org/apache/streampipes/processors/enricher/jvm/processor/math/staticmathop/StaticMathOpProcessor.java
index 8736235b4..6d06297ea 100644
--- a/streampipes-extensions/streampipes-processors-enricher-jvm/src/main/java/org/apache/streampipes/processors/enricher/jvm/processor/math/staticmathop/StaticMathOpProcessor.java
+++ b/streampipes-extensions/streampipes-processors-enricher-jvm/src/main/java/org/apache/streampipes/processors/enricher/jvm/processor/math/staticmathop/StaticMathOpProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.enricher.jvm.processor.math.staticmathop;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -37,9 +39,7 @@ import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.Options;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 public class StaticMathOpProcessor extends StreamPipesDataProcessor {
diff --git a/streampipes-extensions/streampipes-processors-enricher-jvm/src/main/java/org/apache/streampipes/processors/enricher/jvm/processor/sizemeasure/SizeMeasureProcessor.java b/streampipes-extensions/streampipes-processors-enricher-jvm/src/main/java/org/apache/streampipes/processors/enricher/jvm/processor/sizemeasure/SizeMeasureProcessor.java
index 80d4b4ce9..850afe333 100644
--- a/streampipes-extensions/streampipes-processors-enricher-jvm/src/main/java/org/apache/streampipes/processors/enricher/jvm/processor/sizemeasure/SizeMeasureProcessor.java
+++ b/streampipes-extensions/streampipes-processors-enricher-jvm/src/main/java/org/apache/streampipes/processors/enricher/jvm/processor/sizemeasure/SizeMeasureProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.enricher.jvm.processor.sizemeasure;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -32,9 +34,7 @@ import org.apache.streampipes.sdk.helpers.Options;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.helpers.Tuple2;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import java.io.ByteArrayOutputStream;
diff --git a/streampipes-extensions/streampipes-processors-enricher-jvm/src/main/java/org/apache/streampipes/processors/enricher/jvm/processor/trigonometry/TrigonometryProcessor.java b/streampipes-extensions/streampipes-processors-enricher-jvm/src/main/java/org/apache/streampipes/processors/enricher/jvm/processor/trigonometry/TrigonometryProcessor.java
index 072a70f27..f10d4f687 100644
--- a/streampipes-extensions/streampipes-processors-enricher-jvm/src/main/java/org/apache/streampipes/processors/enricher/jvm/processor/trigonometry/TrigonometryProcessor.java
+++ b/streampipes-extensions/streampipes-processors-enricher-jvm/src/main/java/org/apache/streampipes/processors/enricher/jvm/processor/trigonometry/TrigonometryProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.enricher.jvm.processor.trigonometry;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -33,9 +35,7 @@ import org.apache.streampipes.sdk.helpers.Options;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.vocabulary.SO;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 public class TrigonometryProcessor extends StreamPipesDataProcessor {
diff --git a/streampipes-extensions/streampipes-processors-enricher-jvm/src/main/java/org/apache/streampipes/processors/enricher/jvm/processor/valuechange/ValueChangeProcessor.java b/streampipes-extensions/streampipes-processors-enricher-jvm/src/main/java/org/apache/streampipes/processors/enricher/jvm/processor/valuechange/ValueChangeProcessor.java
index 2529e839b..f6bf45163 100644
--- a/streampipes-extensions/streampipes-processors-enricher-jvm/src/main/java/org/apache/streampipes/processors/enricher/jvm/processor/valuechange/ValueChangeProcessor.java
+++ b/streampipes-extensions/streampipes-processors-enricher-jvm/src/main/java/org/apache/streampipes/processors/enricher/jvm/processor/valuechange/ValueChangeProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.enricher.jvm.processor.valuechange;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -32,9 +34,7 @@ import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.vocabulary.SO;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 public class ValueChangeProcessor extends StreamPipesDataProcessor {
diff --git a/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/booleanfilter/BooleanFilterProcessor.java b/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/booleanfilter/BooleanFilterProcessor.java
index b349cd6b3..c44c62a52 100644
--- a/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/booleanfilter/BooleanFilterProcessor.java
+++ b/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/booleanfilter/BooleanFilterProcessor.java
@@ -18,6 +18,8 @@
 package org.apache.streampipes.processors.filters.jvm.processor.booleanfilter;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -30,9 +32,7 @@ import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.Options;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 
diff --git a/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/compose/ComposeProcessor.java b/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/compose/ComposeProcessor.java
index af212817f..59ba4d6c1 100644
--- a/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/compose/ComposeProcessor.java
+++ b/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/compose/ComposeProcessor.java
@@ -18,6 +18,8 @@
 package org.apache.streampipes.processors.filters.jvm.processor.compose;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.constants.PropertySelectorConstants;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
@@ -30,9 +32,7 @@ import org.apache.streampipes.sdk.helpers.EpRequirements;
 import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import java.util.HashMap;
diff --git a/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/enrich/MergeByEnrichProcessor.java b/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/enrich/MergeByEnrichProcessor.java
index dcbcd8754..a1ff2ef14 100644
--- a/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/enrich/MergeByEnrichProcessor.java
+++ b/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/enrich/MergeByEnrichProcessor.java
@@ -18,6 +18,8 @@
 package org.apache.streampipes.processors.filters.jvm.processor.enrich;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -31,9 +33,7 @@ import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.Options;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import java.util.List;
diff --git a/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/limit/RateLimitProcessor.java b/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/limit/RateLimitProcessor.java
index 26f094911..836043c01 100644
--- a/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/limit/RateLimitProcessor.java
+++ b/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/limit/RateLimitProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.filters.jvm.processor.limit;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -37,9 +39,7 @@ import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.Options;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/limit/util/WindowFactory.java b/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/limit/util/WindowFactory.java
index a87fca8d1..f9f73fe70 100644
--- a/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/limit/util/WindowFactory.java
+++ b/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/limit/util/WindowFactory.java
@@ -17,11 +17,11 @@
  */
 package org.apache.streampipes.processors.filters.jvm.processor.limit.util;
 
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.processors.filters.jvm.processor.limit.window.CronWindow;
 import org.apache.streampipes.processors.filters.jvm.processor.limit.window.LengthWindow;
 import org.apache.streampipes.processors.filters.jvm.processor.limit.window.TimeWindow;
 import org.apache.streampipes.processors.filters.jvm.processor.limit.window.Window;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
 
 public class WindowFactory {
   private final WindowType windowType;
diff --git a/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/limit/window/CronWindow.java b/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/limit/window/CronWindow.java
index 98e51ae53..d5947eb6b 100644
--- a/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/limit/window/CronWindow.java
+++ b/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/limit/window/CronWindow.java
@@ -17,9 +17,9 @@
  */
 package org.apache.streampipes.processors.filters.jvm.processor.limit.window;
 
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.processors.filters.jvm.processor.limit.util.EventSelection;
 import org.apache.streampipes.processors.filters.jvm.processor.limit.util.SchedulerUtil;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
 
 import org.quartz.JobDetail;
 import org.quartz.Trigger;
diff --git a/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/limit/window/LengthWindow.java b/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/limit/window/LengthWindow.java
index e21c95faf..0484a665a 100644
--- a/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/limit/window/LengthWindow.java
+++ b/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/limit/window/LengthWindow.java
@@ -17,9 +17,9 @@
  */
 package org.apache.streampipes.processors.filters.jvm.processor.limit.window;
 
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.runtime.Event;
 import org.apache.streampipes.processors.filters.jvm.processor.limit.util.EventSelection;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/limit/window/ScheduleWindow.java b/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/limit/window/ScheduleWindow.java
index 1c260720c..cbd60a292 100644
--- a/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/limit/window/ScheduleWindow.java
+++ b/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/limit/window/ScheduleWindow.java
@@ -18,9 +18,9 @@
 package org.apache.streampipes.processors.filters.jvm.processor.limit.window;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.runtime.Event;
 import org.apache.streampipes.processors.filters.jvm.processor.limit.util.EventSelection;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
 
 import org.quartz.JobDetail;
 import org.quartz.Scheduler;
diff --git a/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/limit/window/TimeWindow.java b/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/limit/window/TimeWindow.java
index 3d740c61d..bed451579 100644
--- a/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/limit/window/TimeWindow.java
+++ b/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/limit/window/TimeWindow.java
@@ -17,9 +17,9 @@
  */
 package org.apache.streampipes.processors.filters.jvm.processor.limit.window;
 
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.processors.filters.jvm.processor.limit.util.EventSelection;
 import org.apache.streampipes.processors.filters.jvm.processor.limit.util.SchedulerUtil;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
 
 import org.quartz.JobDetail;
 import org.quartz.Trigger;
diff --git a/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/merge/MergeByTimeProcessor.java b/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/merge/MergeByTimeProcessor.java
index 79921d104..fcc5c7e22 100644
--- a/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/merge/MergeByTimeProcessor.java
+++ b/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/merge/MergeByTimeProcessor.java
@@ -18,6 +18,8 @@
 package org.apache.streampipes.processors.filters.jvm.processor.merge;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -31,9 +33,7 @@ import org.apache.streampipes.sdk.helpers.Labels;
 import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import java.util.List;
diff --git a/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/movingaverage/MovingAverageProcessor.java b/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/movingaverage/MovingAverageProcessor.java
index df1556529..bcc463a53 100644
--- a/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/movingaverage/MovingAverageProcessor.java
+++ b/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/movingaverage/MovingAverageProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.filters.jvm.processor.movingaverage;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -37,9 +39,7 @@ import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.helpers.Tuple2;
 import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.vocabulary.SO;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 ;
@@ -103,4 +103,4 @@ public class MovingAverageProcessor extends StreamPipesDataProcessor {
   public void onDetach() throws SpRuntimeException {
 
   }
-}
\ No newline at end of file
+}
diff --git a/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/numericalfilter/NumericalFilterProcessor.java b/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/numericalfilter/NumericalFilterProcessor.java
index 7c44598b2..97cd6cfb8 100644
--- a/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/numericalfilter/NumericalFilterProcessor.java
+++ b/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/numericalfilter/NumericalFilterProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.filters.jvm.processor.numericalfilter;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -31,9 +33,7 @@ import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.Options;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 public class NumericalFilterProcessor extends StreamPipesDataProcessor {
diff --git a/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/numericaltextfilter/NumericalTextFilterProcessor.java b/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/numericaltextfilter/NumericalTextFilterProcessor.java
index b78acfff4..b9436e256 100644
--- a/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/numericaltextfilter/NumericalTextFilterProcessor.java
+++ b/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/numericaltextfilter/NumericalTextFilterProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.filters.jvm.processor.numericaltextfilter;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -31,9 +33,7 @@ import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.Options;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 
diff --git a/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/projection/ProjectionProcessor.java b/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/projection/ProjectionProcessor.java
index 143af28d0..a8642a7e9 100644
--- a/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/projection/ProjectionProcessor.java
+++ b/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/projection/ProjectionProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.filters.jvm.processor.projection;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -28,9 +30,7 @@ import org.apache.streampipes.sdk.helpers.EpRequirements;
 import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import java.util.List;
diff --git a/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/schema/MergeBySchemaProcessor.java b/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/schema/MergeBySchemaProcessor.java
index 7ed512324..ab95fc021 100644
--- a/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/schema/MergeBySchemaProcessor.java
+++ b/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/schema/MergeBySchemaProcessor.java
@@ -18,6 +18,8 @@
 package org.apache.streampipes.processors.filters.jvm.processor.schema;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -28,9 +30,7 @@ import org.apache.streampipes.sdk.helpers.EpRequirements;
 import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 
diff --git a/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/sdt/SwingingDoorTrendingFilter.java b/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/sdt/SwingingDoorTrendingFilter.java
index 7e4e3cbf5..ac083c31f 100644
--- a/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/sdt/SwingingDoorTrendingFilter.java
+++ b/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/sdt/SwingingDoorTrendingFilter.java
@@ -18,8 +18,8 @@
 
 package org.apache.streampipes.processors.filters.jvm.processor.sdt;
 
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.runtime.Event;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
 
 public class SwingingDoorTrendingFilter {
 
diff --git a/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/sdt/SwingingDoorTrendingFilterProcessor.java b/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/sdt/SwingingDoorTrendingFilterProcessor.java
index 224cb2868..e13e52d4b 100644
--- a/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/sdt/SwingingDoorTrendingFilterProcessor.java
+++ b/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/sdt/SwingingDoorTrendingFilterProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.filters.jvm.processor.sdt;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -30,9 +32,7 @@ import org.apache.streampipes.sdk.helpers.Labels;
 import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 public class SwingingDoorTrendingFilterProcessor extends StreamPipesDataProcessor {
diff --git a/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/textfilter/TextFilterProcessor.java b/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/textfilter/TextFilterProcessor.java
index 0a9bc049a..05fb8072f 100644
--- a/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/textfilter/TextFilterProcessor.java
+++ b/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/textfilter/TextFilterProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.filters.jvm.processor.textfilter;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -31,9 +33,7 @@ import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.Options;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 public class TextFilterProcessor extends StreamPipesDataProcessor {
@@ -71,8 +71,6 @@ public class TextFilterProcessor extends StreamPipesDataProcessor {
     this.stringOperator =
         StringOperator.valueOf(processorParams.extractor().selectedSingleValue(OPERATION_ID, String.class));
     this.filterProperty = processorParams.extractor().mappingPropertyValue(MAPPING_PROPERTY_ID);
-
-    LOGGER.info("Text Property: " + filterProperty);
   }
 
   @Override
diff --git a/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/threshold/ThresholdDetectionProcessor.java b/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/threshold/ThresholdDetectionProcessor.java
index c54979c1b..578d9045a 100644
--- a/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/threshold/ThresholdDetectionProcessor.java
+++ b/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/threshold/ThresholdDetectionProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.filters.jvm.processor.threshold;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -33,9 +35,7 @@ import org.apache.streampipes.sdk.helpers.Options;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.vocabulary.SO;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 public class ThresholdDetectionProcessor extends StreamPipesDataProcessor {
diff --git a/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/throughputmon/ThroughputMonitorProcessor.java b/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/throughputmon/ThroughputMonitorProcessor.java
index 81686089e..2959b2ae9 100644
--- a/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/throughputmon/ThroughputMonitorProcessor.java
+++ b/streampipes-extensions/streampipes-processors-filters-jvm/src/main/java/org/apache/streampipes/processors/filters/jvm/processor/throughputmon/ThroughputMonitorProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.filters.jvm.processor.throughputmon;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -31,9 +33,7 @@ import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.vocabulary.SO;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import org.apache.commons.lang3.time.StopWatch;
diff --git a/streampipes-extensions/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/count/CountAggregation.java b/streampipes-extensions/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/count/CountAggregation.java
index 46fdafd0e..58d9344ce 100644
--- a/streampipes-extensions/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/count/CountAggregation.java
+++ b/streampipes-extensions/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/count/CountAggregation.java
@@ -41,7 +41,6 @@ import org.apache.streampipes.wrapper.siddhi.query.InsertIntoClause;
 import org.apache.streampipes.wrapper.siddhi.query.SelectClause;
 import org.apache.streampipes.wrapper.siddhi.query.expression.Expressions;
 import org.apache.streampipes.wrapper.siddhi.query.expression.SiddhiTimeUnit;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
 
 public class CountAggregation extends StreamPipesSiddhiProcessor {
 
@@ -84,7 +83,7 @@ public class CountAggregation extends StreamPipesSiddhiProcessor {
   }
 
   @Override
-  public SiddhiAppConfig makeStatements(SiddhiProcessorParams<ProcessorParams> siddhiParams,
+  public SiddhiAppConfig makeStatements(SiddhiProcessorParams siddhiParams,
                                         String finalInsertIntoStreamName) {
     Integer timeWindowSize = siddhiParams.getParams().extractor().singleValueParameter(TIME_WINDOW_KEY, Integer.class);
     String scale = siddhiParams.getParams().extractor().selectedSingleValueInternalName(SCALE_KEY, String.class);
diff --git a/streampipes-extensions/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/filter/NumericalFilterSiddhiProcessor.java b/streampipes-extensions/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/filter/NumericalFilterSiddhiProcessor.java
index 8d4405673..0751df40e 100644
--- a/streampipes-extensions/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/filter/NumericalFilterSiddhiProcessor.java
+++ b/streampipes-extensions/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/filter/NumericalFilterSiddhiProcessor.java
@@ -41,7 +41,6 @@ import org.apache.streampipes.wrapper.siddhi.query.expression.Expression;
 import org.apache.streampipes.wrapper.siddhi.query.expression.Expressions;
 import org.apache.streampipes.wrapper.siddhi.query.expression.RelationalOperator;
 import org.apache.streampipes.wrapper.siddhi.query.expression.RelationalOperatorExpression;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
 
 public class NumericalFilterSiddhiProcessor extends StreamPipesSiddhiProcessor {
 
@@ -72,7 +71,7 @@ public class NumericalFilterSiddhiProcessor extends StreamPipesSiddhiProcessor {
   }
 
   @Override
-  public SiddhiAppConfig makeStatements(SiddhiProcessorParams<ProcessorParams> siddhiParams,
+  public SiddhiAppConfig makeStatements(SiddhiProcessorParams siddhiParams,
                                         String finalInsertIntoStreamName) {
 
     var extractor = siddhiParams.getParams().extractor();
diff --git a/streampipes-extensions/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/frequency/FrequencySiddhiProcessor.java b/streampipes-extensions/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/frequency/FrequencySiddhiProcessor.java
index 3438aebcd..c88df362b 100644
--- a/streampipes-extensions/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/frequency/FrequencySiddhiProcessor.java
+++ b/streampipes-extensions/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/frequency/FrequencySiddhiProcessor.java
@@ -34,7 +34,6 @@ import org.apache.streampipes.wrapper.siddhi.engine.StreamPipesSiddhiProcessor;
 import org.apache.streampipes.wrapper.siddhi.model.SiddhiProcessorParams;
 import org.apache.streampipes.wrapper.siddhi.query.InsertIntoClause;
 import org.apache.streampipes.wrapper.siddhi.query.SelectClause;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
 
 public class FrequencySiddhiProcessor extends StreamPipesSiddhiProcessor {
 
@@ -59,7 +58,7 @@ public class FrequencySiddhiProcessor extends StreamPipesSiddhiProcessor {
   }
 
   @Override
-  public SiddhiAppConfig makeStatements(SiddhiProcessorParams<ProcessorParams> siddhiParams,
+  public SiddhiAppConfig makeStatements(SiddhiProcessorParams siddhiParams,
                                         String finalInsertIntoStreamName) {
     var extractor = siddhiParams.getParams().extractor();
     int duration = extractor.singleValueParameter(DURATION, Integer.class);
@@ -75,7 +74,7 @@ public class FrequencySiddhiProcessor extends StreamPipesSiddhiProcessor {
         .build();
   }
 
-  private String fromStatement(SiddhiProcessorParams<ProcessorParams> params,
+  private String fromStatement(SiddhiProcessorParams params,
                                int duration,
                                String timeUnit) {
     return "from every not "
diff --git a/streampipes-extensions/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/frequencychange/FrequencyChangeSiddhiProcessor.java b/streampipes-extensions/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/frequencychange/FrequencyChangeSiddhiProcessor.java
index b8b7718b5..ba9dab64f 100644
--- a/streampipes-extensions/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/frequencychange/FrequencyChangeSiddhiProcessor.java
+++ b/streampipes-extensions/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/frequencychange/FrequencyChangeSiddhiProcessor.java
@@ -34,7 +34,6 @@ import org.apache.streampipes.wrapper.siddhi.engine.StreamPipesSiddhiProcessor;
 import org.apache.streampipes.wrapper.siddhi.model.SiddhiProcessorParams;
 import org.apache.streampipes.wrapper.siddhi.query.InsertIntoClause;
 import org.apache.streampipes.wrapper.siddhi.query.SelectClause;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
 
 public class FrequencyChangeSiddhiProcessor extends StreamPipesSiddhiProcessor {
 
@@ -62,7 +61,7 @@ public class FrequencyChangeSiddhiProcessor extends StreamPipesSiddhiProcessor {
   }
 
   @Override
-  public SiddhiAppConfig makeStatements(SiddhiProcessorParams<ProcessorParams> siddhiParams,
+  public SiddhiAppConfig makeStatements(SiddhiProcessorParams siddhiParams,
                                         String finalInsertIntoStreamName) {
 
     var extractor = siddhiParams.getParams().extractor();
@@ -79,7 +78,7 @@ public class FrequencyChangeSiddhiProcessor extends StreamPipesSiddhiProcessor {
         .build();
   }
 
-  private String fromStatement(SiddhiProcessorParams<ProcessorParams> siddhiParams,
+  private String fromStatement(SiddhiProcessorParams siddhiParams,
                                int duration) {
     return "from every not "
         + siddhiParams.getInputStreamNames().get(0)
@@ -88,7 +87,7 @@ public class FrequencyChangeSiddhiProcessor extends StreamPipesSiddhiProcessor {
         + " sec";
   }
 
-  private String selectStatement(SiddhiProcessorParams<ProcessorParams> siddhiParams) {
+  private String selectStatement(SiddhiProcessorParams siddhiParams) {
     return SelectClause.createWildcard().toSiddhiEpl();
   }
 }
diff --git a/streampipes-extensions/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/listcollector/ListCollector.java b/streampipes-extensions/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/listcollector/ListCollector.java
index e76f0e86c..7db968d08 100644
--- a/streampipes-extensions/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/listcollector/ListCollector.java
+++ b/streampipes-extensions/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/listcollector/ListCollector.java
@@ -47,7 +47,6 @@ import org.apache.streampipes.wrapper.siddhi.query.FromClause;
 import org.apache.streampipes.wrapper.siddhi.query.InsertIntoClause;
 import org.apache.streampipes.wrapper.siddhi.query.SelectClause;
 import org.apache.streampipes.wrapper.siddhi.query.expression.Expressions;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
 
 import java.util.Collections;
 import java.util.List;
@@ -101,7 +100,7 @@ public class ListCollector extends StreamPipesSiddhiProcessor
   }
 
   @Override
-  public SiddhiAppConfig makeStatements(SiddhiProcessorParams<ProcessorParams> siddhiParams,
+  public SiddhiAppConfig makeStatements(SiddhiProcessorParams siddhiParams,
                                         String finalInsertIntoStreamName) {
     Integer batchWindowSize = siddhiParams.getParams().extractor().singleValueParameter(WINDOW_SIZE, Integer.class);
     String propertySelector = siddhiParams.getParams().extractor().mappingPropertyValue(LIST_KEY);
diff --git a/streampipes-extensions/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/listfilter/ListFilter.java b/streampipes-extensions/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/listfilter/ListFilter.java
index be460dc58..f33cd1775 100644
--- a/streampipes-extensions/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/listfilter/ListFilter.java
+++ b/streampipes-extensions/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/listfilter/ListFilter.java
@@ -17,6 +17,7 @@
  */
 package org.apache.streampipes.processors.siddhi.listfilter;
 
+import org.apache.streampipes.extensions.api.extractor.IDataProcessorParameterExtractor;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.schema.EventPropertyList;
@@ -24,7 +25,6 @@ import org.apache.streampipes.model.schema.EventPropertyPrimitive;
 import org.apache.streampipes.model.schema.PropertyScope;
 import org.apache.streampipes.sdk.builder.ProcessingElementBuilder;
 import org.apache.streampipes.sdk.builder.StreamRequirementsBuilder;
-import org.apache.streampipes.sdk.extractor.ProcessingElementParameterExtractor;
 import org.apache.streampipes.sdk.helpers.EpRequirements;
 import org.apache.streampipes.sdk.helpers.Labels;
 import org.apache.streampipes.sdk.helpers.Locales;
@@ -40,7 +40,6 @@ import org.apache.streampipes.wrapper.siddhi.query.InsertIntoClause;
 import org.apache.streampipes.wrapper.siddhi.query.SelectClause;
 import org.apache.streampipes.wrapper.siddhi.query.expression.Expression;
 import org.apache.streampipes.wrapper.siddhi.query.expression.Expressions;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
 
 public class ListFilter extends StreamPipesSiddhiProcessor {
 
@@ -62,13 +61,13 @@ public class ListFilter extends StreamPipesSiddhiProcessor {
         .build();
   }
 
-  private Object extractFilterValue(String selector, ProcessingElementParameterExtractor extractor) {
+  private Object extractFilterValue(String selector, IDataProcessorParameterExtractor extractor) {
     EventPropertyList prop = (EventPropertyList) extractor.getEventPropertyBySelector(selector);
     return extractor.singleValueParameter((EventPropertyPrimitive) prop.getEventProperty(), REQUIRED_VALUE_KEY);
   }
 
   @Override
-  public SiddhiAppConfig makeStatements(SiddhiProcessorParams<ProcessorParams> siddhiParams,
+  public SiddhiAppConfig makeStatements(SiddhiProcessorParams siddhiParams,
                                         String finalInsertIntoStreamName) {
     String filteredFieldSelector = siddhiParams.getParams().extractor().mappingPropertyValue(LIST_KEY);
     Object filterValue = extractFilterValue(filteredFieldSelector, siddhiParams.getParams().extractor());
diff --git a/streampipes-extensions/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/sequence/SequenceSiddhiProcessor.java b/streampipes-extensions/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/sequence/SequenceSiddhiProcessor.java
index 2c1cd5578..c0f5b66a0 100644
--- a/streampipes-extensions/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/sequence/SequenceSiddhiProcessor.java
+++ b/streampipes-extensions/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/sequence/SequenceSiddhiProcessor.java
@@ -33,7 +33,6 @@ import org.apache.streampipes.wrapper.siddhi.engine.StreamPipesSiddhiProcessor;
 import org.apache.streampipes.wrapper.siddhi.model.SiddhiProcessorParams;
 import org.apache.streampipes.wrapper.siddhi.query.InsertIntoClause;
 import org.apache.streampipes.wrapper.siddhi.query.SelectClause;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
 
 public class SequenceSiddhiProcessor extends StreamPipesSiddhiProcessor {
 
@@ -60,7 +59,7 @@ public class SequenceSiddhiProcessor extends StreamPipesSiddhiProcessor {
   }
 
   @Override
-  public SiddhiAppConfig makeStatements(SiddhiProcessorParams<ProcessorParams> siddhiParams,
+  public SiddhiAppConfig makeStatements(SiddhiProcessorParams siddhiParams,
                                         String finalInsertIntoStreamName) {
     var extractor = siddhiParams.getParams().extractor();
     int duration = extractor.singleValueParameter(Duration, Integer.class);
@@ -75,7 +74,7 @@ public class SequenceSiddhiProcessor extends StreamPipesSiddhiProcessor {
         .build();
   }
 
-  private String fromStatement(SiddhiProcessorParams<ProcessorParams> siddhiParams,
+  private String fromStatement(SiddhiProcessorParams siddhiParams,
                                int duration) {
 
     return "from every not "
@@ -85,7 +84,7 @@ public class SequenceSiddhiProcessor extends StreamPipesSiddhiProcessor {
         + " sec";
   }
 
-  private SelectClause selectStatement(SiddhiProcessorParams<ProcessorParams> siddhiParams) {
+  private SelectClause selectStatement(SiddhiProcessorParams siddhiParams) {
     return SelectClause.createWildcard();
   }
 }
diff --git a/streampipes-extensions/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/stop/StreamStopSiddhiProcessor.java b/streampipes-extensions/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/stop/StreamStopSiddhiProcessor.java
index 6b16c2dd1..6b2422d48 100644
--- a/streampipes-extensions/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/stop/StreamStopSiddhiProcessor.java
+++ b/streampipes-extensions/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/stop/StreamStopSiddhiProcessor.java
@@ -33,7 +33,6 @@ import org.apache.streampipes.wrapper.siddhi.SiddhiQueryBuilder;
 import org.apache.streampipes.wrapper.siddhi.engine.StreamPipesSiddhiProcessor;
 import org.apache.streampipes.wrapper.siddhi.model.SiddhiProcessorParams;
 import org.apache.streampipes.wrapper.siddhi.query.InsertIntoClause;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
 
 import java.util.Arrays;
 
@@ -64,7 +63,7 @@ public class StreamStopSiddhiProcessor extends StreamPipesSiddhiProcessor {
   }
 
   @Override
-  public SiddhiAppConfig makeStatements(SiddhiProcessorParams<ProcessorParams> siddhiParams,
+  public SiddhiAppConfig makeStatements(SiddhiProcessorParams siddhiParams,
                                         String finalInsertIntoStreamName) {
     var extractor = siddhiParams.getParams().extractor();
     int duration = extractor.singleValueParameter(Duration, Integer.class);
@@ -80,7 +79,7 @@ public class StreamStopSiddhiProcessor extends StreamPipesSiddhiProcessor {
         .build();
   }
 
-  private String fromStatement(SiddhiProcessorParams<ProcessorParams> siddhiParams,
+  private String fromStatement(SiddhiProcessorParams siddhiParams,
                                int duration) {
     return "define stream Test(timestamp LONG,message STRING);\n"
         + "from every not "
@@ -89,7 +88,7 @@ public class StreamStopSiddhiProcessor extends StreamPipesSiddhiProcessor {
         + " sec";
   }
 
-  private String selectStatement(SiddhiProcessorParams<ProcessorParams> siddhiParams) {
+  private String selectStatement(SiddhiProcessorParams siddhiParams) {
     return "select currentTimeMillis() as timestamp, 'Event stream has stopped' as message";
   }
 }
diff --git a/streampipes-extensions/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/topk/TopK.java b/streampipes-extensions/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/topk/TopK.java
index 0edc6c60b..703a683ca 100644
--- a/streampipes-extensions/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/topk/TopK.java
+++ b/streampipes-extensions/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/topk/TopK.java
@@ -17,12 +17,12 @@
  */
 package org.apache.streampipes.processors.siddhi.topk;
 
+import org.apache.streampipes.extensions.api.extractor.IDataProcessorParameterExtractor;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.schema.PropertyScope;
 import org.apache.streampipes.sdk.builder.ProcessingElementBuilder;
 import org.apache.streampipes.sdk.builder.StreamRequirementsBuilder;
-import org.apache.streampipes.sdk.extractor.ProcessingElementParameterExtractor;
 import org.apache.streampipes.sdk.helpers.EpProperties;
 import org.apache.streampipes.sdk.helpers.EpRequirements;
 import org.apache.streampipes.sdk.helpers.Labels;
@@ -46,7 +46,6 @@ import org.apache.streampipes.wrapper.siddhi.query.OrderByClause;
 import org.apache.streampipes.wrapper.siddhi.query.SelectClause;
 import org.apache.streampipes.wrapper.siddhi.query.expression.Expressions;
 import org.apache.streampipes.wrapper.siddhi.query.expression.SiddhiTimeUnit;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
 
 import io.siddhi.query.api.execution.query.selection.OrderByAttribute;
 
@@ -97,9 +96,9 @@ public class TopK extends StreamPipesSiddhiProcessor {
   }
 
   @Override
-  public SiddhiAppConfig makeStatements(SiddhiProcessorParams<ProcessorParams> siddhiParams,
+  public SiddhiAppConfig makeStatements(SiddhiProcessorParams siddhiParams,
                                         String finalInsertIntoStreamName) {
-    ProcessingElementParameterExtractor extractor = siddhiParams.getParams().extractor();
+    IDataProcessorParameterExtractor extractor = siddhiParams.getParams().extractor();
     Integer windowSize = extractor.singleValueParameter(WINDOW_SIZE, Integer.class);
     String valueSelector = extractor.mappingPropertyValue(VALUE_KEY);
     String countSelector = extractor.mappingPropertyValue(COUNT_KEY);
diff --git a/streampipes-extensions/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/trend/TrendProcessor.java b/streampipes-extensions/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/trend/TrendProcessor.java
index d62811913..36009060a 100644
--- a/streampipes-extensions/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/trend/TrendProcessor.java
+++ b/streampipes-extensions/streampipes-processors-filters-siddhi/src/main/java/org/apache/streampipes/processors/siddhi/trend/TrendProcessor.java
@@ -45,7 +45,6 @@ import org.apache.streampipes.wrapper.siddhi.query.expression.SiddhiTimeUnit;
 import org.apache.streampipes.wrapper.siddhi.query.expression.StreamExpression;
 import org.apache.streampipes.wrapper.siddhi.query.expression.StreamFilterExpression;
 import org.apache.streampipes.wrapper.siddhi.query.expression.pattern.PatternCountOperator;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
 
 import java.util.List;
 
@@ -94,7 +93,7 @@ public class TrendProcessor extends StreamPipesSiddhiProcessor {
   }
 
   @Override
-  public SiddhiAppConfig makeStatements(SiddhiProcessorParams<ProcessorParams> siddhiParams,
+  public SiddhiAppConfig makeStatements(SiddhiProcessorParams siddhiParams,
                                         String finalInsertIntoStreamName) {
 
     InsertIntoClause insertIntoClause = InsertIntoClause.create(finalInsertIntoStreamName);
@@ -108,7 +107,7 @@ public class TrendProcessor extends StreamPipesSiddhiProcessor {
         .build();
   }
 
-  public FromClause fromStatement(SiddhiProcessorParams<ProcessorParams> siddhiParams) {
+  public FromClause fromStatement(SiddhiProcessorParams siddhiParams) {
     var extractor = siddhiParams.getParams().extractor();
     var operation = getOperation(extractor.selectedSingleValue(OPERATION, String.class));
     double increase = extractor.singleValueParameter(INCREASE, Double.class);
@@ -144,7 +143,7 @@ public class TrendProcessor extends StreamPipesSiddhiProcessor {
     return fromClause;
   }
 
-  private SelectClause selectStatement(SiddhiProcessorParams<ProcessorParams> siddhiParams) {
+  private SelectClause selectStatement(SiddhiProcessorParams siddhiParams) {
     List<String> outputFieldSelectors = siddhiParams.getParams().extractor().outputKeySelectors();
     SelectClause selectClause = SelectClause.create();
     outputFieldSelectors
diff --git a/streampipes-extensions/streampipes-processors-filters-siddhi/src/test/java/org/apache/streampipes/processors/siddhi/trend/TestTrendProcessor.java b/streampipes-extensions/streampipes-processors-filters-siddhi/src/test/java/org/apache/streampipes/processors/siddhi/trend/TestTrendProcessor.java
index 1f028f0e9..c8352c0ac 100644
--- a/streampipes-extensions/streampipes-processors-filters-siddhi/src/test/java/org/apache/streampipes/processors/siddhi/trend/TestTrendProcessor.java
+++ b/streampipes-extensions/streampipes-processors-filters-siddhi/src/test/java/org/apache/streampipes/processors/siddhi/trend/TestTrendProcessor.java
@@ -28,8 +28,8 @@ import org.apache.streampipes.sdk.helpers.Tuple2;
 import org.apache.streampipes.test.generator.EventStreamGenerator;
 import org.apache.streampipes.test.generator.InvocationGraphGenerator;
 import org.apache.streampipes.test.generator.grounding.EventGroundingGenerator;
+import org.apache.streampipes.wrapper.params.generator.DataProcessorParameterGenerator;
 import org.apache.streampipes.wrapper.siddhi.engine.callback.SiddhiDebugCallback;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -132,7 +132,7 @@ public class TestTrendProcessor {
         timeWindow);
     graph.getStaticProperties().forEach(sp -> sp.accept(visitor));
 
-    ProcessorParams processorParams = new ProcessorParams(graph);
+    var processorParams = new DataProcessorParameterGenerator().makeParameters(graph);
 
     SiddhiDebugCallback callback = new SiddhiDebugCallback() {
       @Override
@@ -147,7 +147,7 @@ public class TestTrendProcessor {
     };
 
     TrendProcessor trend = new TrendProcessor(callback);
-    trend.onInvocation(processorParams, null, null);
+    trend.onPipelineStarted(processorParams, null, null);
 
     sendEvents(trend);
     LOG.info("Expected match count is {}", expectedMatchCount);
diff --git a/streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/AbstractGeoProgram.java b/streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/AbstractGeoProgram.java
deleted file mode 100644
index 80614c914..000000000
--- a/streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/AbstractGeoProgram.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.streampipes.processor.geo.flink;
-
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
-import org.apache.streampipes.processor.geo.flink.config.ConfigKeys;
-import org.apache.streampipes.svcdiscovery.api.SpConfig;
-import org.apache.streampipes.wrapper.flink.FlinkDataProcessorRuntime;
-import org.apache.streampipes.wrapper.flink.FlinkDeploymentConfig;
-import org.apache.streampipes.wrapper.params.binding.EventProcessorBindingParams;
-
-public abstract class AbstractGeoProgram<T extends EventProcessorBindingParams> extends FlinkDataProcessorRuntime<T> {
-
-  public AbstractGeoProgram(T params,
-                            ConfigExtractor configExtractor,
-                            StreamPipesClient streamPipesClient) {
-    super(params, configExtractor, streamPipesClient);
-  }
-
-  @Override
-  protected FlinkDeploymentConfig getDeploymentConfig(ConfigExtractor configExtractor) {
-    SpConfig config = configExtractor.getConfig();
-    return new FlinkDeploymentConfig(config.getString(
-        ConfigKeys.FLINK_JAR_FILE_LOC),
-        config.getString(ConfigKeys.FLINK_HOST),
-        config.getInteger(ConfigKeys.FLINK_PORT),
-        config.getBoolean(ConfigKeys.DEBUG)
-    );
-  }
-}
-
diff --git a/streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/processor/gridenricher/SpatialGridEnrichmentController.java b/streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/processor/gridenricher/SpatialGridEnrichmentController.java
index 7fcc2c796..84e96dd68 100644
--- a/streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/processor/gridenricher/SpatialGridEnrichmentController.java
+++ b/streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/processor/gridenricher/SpatialGridEnrichmentController.java
@@ -18,8 +18,6 @@
 
 package org.apache.streampipes.processor.geo.flink.processor.gridenricher;
 
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
 import org.apache.streampipes.model.schema.PropertyScope;
@@ -36,7 +34,7 @@ import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.vocabulary.Geo;
 import org.apache.streampipes.vocabulary.SO;
 import org.apache.streampipes.wrapper.flink.FlinkDataProcessorDeclarer;
-import org.apache.streampipes.wrapper.flink.FlinkDataProcessorRuntime;
+import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
 
 public class SpatialGridEnrichmentController extends FlinkDataProcessorDeclarer<SpatialGridEnrichmentParameters> {
 
@@ -75,11 +73,9 @@ public class SpatialGridEnrichmentController extends FlinkDataProcessorDeclarer<
   }
 
   @Override
-  public FlinkDataProcessorRuntime<SpatialGridEnrichmentParameters> getRuntime(
+  public FlinkDataProcessorProgram<SpatialGridEnrichmentParameters> getProgram(
       DataProcessorInvocation graph,
-      ProcessingElementParameterExtractor extractor,
-      ConfigExtractor configExtractor,
-      StreamPipesClient streamPipesClient) {
+      ProcessingElementParameterExtractor extractor) {
 
     Integer cellSize = extractor.singleValueParameter(CELLSIZE, Integer.class);
     String latitudePropertyName = extractor.mappingPropertyValue(MAPPING_LATITUDE);
@@ -100,7 +96,7 @@ public class SpatialGridEnrichmentController extends FlinkDataProcessorDeclarer<
     SpatialGridEnrichmentParameters params = new SpatialGridEnrichmentParameters(graph,
         enrichmentSettings);
 
-    return new SpatialGridEnrichmentProgram(params, configExtractor, streamPipesClient);
+    return new SpatialGridEnrichmentProgram(params);
 
   }
 }
diff --git a/streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/processor/gridenricher/SpatialGridEnrichmentParameters.java b/streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/processor/gridenricher/SpatialGridEnrichmentParameters.java
index c54631f79..5e76cf9ce 100644
--- a/streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/processor/gridenricher/SpatialGridEnrichmentParameters.java
+++ b/streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/processor/gridenricher/SpatialGridEnrichmentParameters.java
@@ -19,9 +19,9 @@
 package org.apache.streampipes.processor.geo.flink.processor.gridenricher;
 
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
-import org.apache.streampipes.wrapper.params.binding.EventProcessorBindingParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 
-public class SpatialGridEnrichmentParameters extends EventProcessorBindingParams {
+public class SpatialGridEnrichmentParameters extends ProcessorParams {
 
   private EnrichmentSettings enrichmentSettings;
 
diff --git a/streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/processor/gridenricher/SpatialGridEnrichmentProgram.java b/streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/processor/gridenricher/SpatialGridEnrichmentProgram.java
index 58d85f0c8..a94813ea8 100644
--- a/streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/processor/gridenricher/SpatialGridEnrichmentProgram.java
+++ b/streampipes-extensions/streampipes-processors-geo-flink/src/main/java/org/apache/streampipes/processor/geo/flink/processor/gridenricher/SpatialGridEnrichmentProgram.java
@@ -18,23 +18,19 @@
 
 package org.apache.streampipes.processor.geo.flink.processor.gridenricher;
 
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
 import org.apache.streampipes.model.runtime.Event;
-import org.apache.streampipes.processor.geo.flink.AbstractGeoProgram;
+import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
 
 import org.apache.flink.streaming.api.datastream.DataStream;
 
-public class SpatialGridEnrichmentProgram extends AbstractGeoProgram<SpatialGridEnrichmentParameters> {
+public class SpatialGridEnrichmentProgram extends FlinkDataProcessorProgram<SpatialGridEnrichmentParameters> {
 
-  public SpatialGridEnrichmentProgram(SpatialGridEnrichmentParameters params,
-                                      ConfigExtractor configExtractor,
-                                      StreamPipesClient streamPipesClient) {
-    super(params, configExtractor, streamPipesClient);
+  public SpatialGridEnrichmentProgram(SpatialGridEnrichmentParameters params) {
+    super(params);
   }
 
   @Override
-  protected DataStream<Event> getApplicationLogic(DataStream<Event>[] messageStream) {
+  public DataStream<Event> getApplicationLogic(DataStream<Event>[] messageStream) {
     return messageStream[0].flatMap(new SpatialGridEnricher(params.getEnrichmentSettings()));
   }
 }
diff --git a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/buffergeometry/BufferGeomProcessor.java b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/buffergeometry/BufferGeomProcessor.java
index f8498bf16..bac111953 100644
--- a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/buffergeometry/BufferGeomProcessor.java
+++ b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/buffergeometry/BufferGeomProcessor.java
@@ -18,6 +18,8 @@
 package org.apache.streampipes.processors.geo.jvm.jts.processor.buffergeometry;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -37,9 +39,7 @@ import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.Options;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import org.locationtech.jts.geom.Geometry;
diff --git a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/bufferpoint/BufferPointProcessor.java b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/bufferpoint/BufferPointProcessor.java
index 66b914b81..690e18460 100644
--- a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/bufferpoint/BufferPointProcessor.java
+++ b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/bufferpoint/BufferPointProcessor.java
@@ -18,6 +18,8 @@
 package org.apache.streampipes.processors.geo.jvm.jts.processor.bufferpoint;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -35,9 +37,7 @@ import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.Options;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import org.locationtech.jts.geom.Geometry;
diff --git a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/epsg/EpsgProcessor.java b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/epsg/EpsgProcessor.java
index 5720e21cd..12ca88133 100644
--- a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/epsg/EpsgProcessor.java
+++ b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/epsg/EpsgProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.geo.jvm.jts.processor.epsg;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -30,9 +32,7 @@ import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.sdk.utils.Datatypes;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 public class EpsgProcessor extends StreamPipesDataProcessor {
diff --git a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/latlngtojtspoint/LatLngToJtsPointProcessor.java b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/latlngtojtspoint/LatLngToJtsPointProcessor.java
index 5e9f31a9a..dba482b90 100644
--- a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/latlngtojtspoint/LatLngToJtsPointProcessor.java
+++ b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/latlngtojtspoint/LatLngToJtsPointProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.geo.jvm.jts.processor.latlngtojtspoint;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -34,9 +36,7 @@ import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.sdk.utils.Datatypes;
 import org.apache.streampipes.vocabulary.Geo;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import org.locationtech.jts.geom.Point;
diff --git a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/reprojection/ReprojectionProcessor.java b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/reprojection/ReprojectionProcessor.java
index b5ea47f5f..2186e5531 100644
--- a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/reprojection/ReprojectionProcessor.java
+++ b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/reprojection/ReprojectionProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.geo.jvm.jts.processor.reprojection;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -33,9 +35,7 @@ import org.apache.streampipes.sdk.helpers.Labels;
 import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import org.locationtech.jts.geom.Geometry;
diff --git a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/trajectory/TrajectoryFromPointsProcessor.java b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/trajectory/TrajectoryFromPointsProcessor.java
index ad8554e47..4d7445820 100644
--- a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/trajectory/TrajectoryFromPointsProcessor.java
+++ b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/trajectory/TrajectoryFromPointsProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.geo.jvm.jts.processor.trajectory;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -34,9 +36,7 @@ import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.vocabulary.SO;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import org.locationtech.jts.geom.LineString;
diff --git a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/validation/complex/TopologyValidationProcessor.java b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/validation/complex/TopologyValidationProcessor.java
index 6568c1804..f0910c893 100644
--- a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/validation/complex/TopologyValidationProcessor.java
+++ b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/validation/complex/TopologyValidationProcessor.java
@@ -20,6 +20,8 @@ package org.apache.streampipes.processors.geo.jvm.jts.processor.validation.compl
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
 import org.apache.streampipes.extensions.api.monitoring.SpMonitoringManager;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.StreamPipesErrorMessage;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
@@ -37,9 +39,7 @@ import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.Options;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import org.locationtech.jts.geom.Geometry;
diff --git a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/validation/simple/GeometryValidationProcessor.java b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/validation/simple/GeometryValidationProcessor.java
index 1bbb11e5f..e117c9e55 100644
--- a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/validation/simple/GeometryValidationProcessor.java
+++ b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/jts/processor/validation/simple/GeometryValidationProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.geo.jvm.jts.processor.validation.simple;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -34,9 +36,7 @@ import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.Options;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import org.locationtech.jts.geom.Geometry;
diff --git a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/latlong/processor/distancecalculator/haversine/HaversineDistanceCalculatorProcessor.java b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/latlong/processor/distancecalculator/haversine/HaversineDistanceCalculatorProcessor.java
index 23ea01758..53a38e6cd 100644
--- a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/latlong/processor/distancecalculator/haversine/HaversineDistanceCalculatorProcessor.java
+++ b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/latlong/processor/distancecalculator/haversine/HaversineDistanceCalculatorProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.geo.jvm.latlong.processor.distancecalculator.haversine;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -35,9 +37,7 @@ import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.sdk.utils.Datatypes;
 import org.apache.streampipes.vocabulary.Geo;
 import org.apache.streampipes.vocabulary.SO;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import java.net.URI;
diff --git a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/latlong/processor/distancecalculator/haversinestatic/HaversineStaticDistanceCalculatorProcessor.java b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/latlong/processor/distancecalculator/haversinestatic/HaversineStaticDistanceCalculatorProcessor.java
index c99d5c04c..ca3a35c03 100644
--- a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/latlong/processor/distancecalculator/haversinestatic/HaversineStaticDistanceCalculatorProcessor.java
+++ b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/latlong/processor/distancecalculator/haversinestatic/HaversineStaticDistanceCalculatorProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.geo.jvm.latlong.processor.distancecalculator.haversinestatic;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -35,9 +37,7 @@ import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.sdk.utils.Datatypes;
 import org.apache.streampipes.vocabulary.Geo;
 import org.apache.streampipes.vocabulary.SO;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import java.net.URI;
diff --git a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/latlong/processor/geocoder/googlemaps/GoogleMapsGeocoderProcessor.java b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/latlong/processor/geocoder/googlemaps/GoogleMapsGeocoderProcessor.java
index 9fb3b1a89..e07af4cf6 100644
--- a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/latlong/processor/geocoder/googlemaps/GoogleMapsGeocoderProcessor.java
+++ b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/latlong/processor/geocoder/googlemaps/GoogleMapsGeocoderProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.geo.jvm.latlong.processor.geocoder.googlemaps;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -33,9 +35,7 @@ import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.vocabulary.Geo;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import com.google.maps.GeoApiContext;
diff --git a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/latlong/processor/geocoder/googlemapsstatic/GoogleMapsStaticGeocoderProcessor.java b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/latlong/processor/geocoder/googlemapsstatic/GoogleMapsStaticGeocoderProcessor.java
index 29f6c5302..8f9f8cdcb 100644
--- a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/latlong/processor/geocoder/googlemapsstatic/GoogleMapsStaticGeocoderProcessor.java
+++ b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/latlong/processor/geocoder/googlemapsstatic/GoogleMapsStaticGeocoderProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.geo.jvm.latlong.processor.geocoder.googlemapsstatic;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -32,9 +34,7 @@ import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.vocabulary.Geo;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import com.google.maps.GeoApiContext;
diff --git a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/latlong/processor/revgeocoder/geocityname/GeoCityNameRevdecodeProcessor.java b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/latlong/processor/revgeocoder/geocityname/GeoCityNameRevdecodeProcessor.java
index 8f287810e..1c493d73a 100644
--- a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/latlong/processor/revgeocoder/geocityname/GeoCityNameRevdecodeProcessor.java
+++ b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/latlong/processor/revgeocoder/geocityname/GeoCityNameRevdecodeProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.geo.jvm.latlong.processor.revgeocoder.geocityname;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -34,9 +36,7 @@ import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.vocabulary.Geo;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import org.apache.http.client.fluent.Request;
diff --git a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/latlong/processor/speedcalculator/SpeedCalculatorProcessor.java b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/latlong/processor/speedcalculator/SpeedCalculatorProcessor.java
index e102dcceb..a1c0baef6 100644
--- a/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/latlong/processor/speedcalculator/SpeedCalculatorProcessor.java
+++ b/streampipes-extensions/streampipes-processors-geo-jvm/src/main/java/org/apache/streampipes/processors/geo/jvm/latlong/processor/speedcalculator/SpeedCalculatorProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.geo.jvm.latlong.processor.speedcalculator;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -35,9 +37,7 @@ import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.sdk.utils.Datatypes;
 import org.apache.streampipes.vocabulary.Geo;
 import org.apache.streampipes.vocabulary.SO;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import org.apache.commons.collections.buffer.CircularFifoBuffer;
diff --git a/streampipes-extensions/streampipes-processors-image-processing-jvm/src/main/java/org/apache/streampipes/processors/imageprocessing/jvm/processor/genericclassification/GenericImageClassificationProcessor.java b/streampipes-extensions/streampipes-processors-image-processing-jvm/src/main/java/org/apache/streampipes/processors/imageprocessing/jvm/processor/genericclassification/GenericImageClassificationProcessor.java
index a40b180e1..686474420 100644
--- a/streampipes-extensions/streampipes-processors-image-processing-jvm/src/main/java/org/apache/streampipes/processors/imageprocessing/jvm/processor/genericclassification/GenericImageClassificationProcessor.java
+++ b/streampipes-extensions/streampipes-processors-image-processing-jvm/src/main/java/org/apache/streampipes/processors/imageprocessing/jvm/processor/genericclassification/GenericImageClassificationProcessor.java
@@ -18,6 +18,8 @@
 package org.apache.streampipes.processors.imageprocessing.jvm.processor.genericclassification;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -33,9 +35,7 @@ import org.apache.streampipes.sdk.helpers.Labels;
 import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import boofcv.abst.scene.ImageClassifier;
diff --git a/streampipes-extensions/streampipes-processors-image-processing-jvm/src/main/java/org/apache/streampipes/processors/imageprocessing/jvm/processor/imagecropper/ImageCropperProcessor.java b/streampipes-extensions/streampipes-processors-image-processing-jvm/src/main/java/org/apache/streampipes/processors/imageprocessing/jvm/processor/imagecropper/ImageCropperProcessor.java
index 6aa45afd7..7bd05053f 100644
--- a/streampipes-extensions/streampipes-processors-image-processing-jvm/src/main/java/org/apache/streampipes/processors/imageprocessing/jvm/processor/imagecropper/ImageCropperProcessor.java
+++ b/streampipes-extensions/streampipes-processors-image-processing-jvm/src/main/java/org/apache/streampipes/processors/imageprocessing/jvm/processor/imagecropper/ImageCropperProcessor.java
@@ -19,6 +19,8 @@ package org.apache.streampipes.processors.imageprocessing.jvm.processor.imagecro
 
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -33,9 +35,7 @@ import org.apache.streampipes.sdk.helpers.Labels;
 import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import java.awt.image.BufferedImage;
diff --git a/streampipes-extensions/streampipes-processors-image-processing-jvm/src/main/java/org/apache/streampipes/processors/imageprocessing/jvm/processor/imageenrichment/ImageEnrichmentProcessor.java b/streampipes-extensions/streampipes-processors-image-processing-jvm/src/main/java/org/apache/streampipes/processors/imageprocessing/jvm/processor/imageenrichment/ImageEnrichmentProcessor.java
index 827df8fbb..4f959c4ad 100644
--- a/streampipes-extensions/streampipes-processors-image-processing-jvm/src/main/java/org/apache/streampipes/processors/imageprocessing/jvm/processor/imageenrichment/ImageEnrichmentProcessor.java
+++ b/streampipes-extensions/streampipes-processors-image-processing-jvm/src/main/java/org/apache/streampipes/processors/imageprocessing/jvm/processor/imageenrichment/ImageEnrichmentProcessor.java
@@ -18,6 +18,8 @@
 package org.apache.streampipes.processors.imageprocessing.jvm.processor.imageenrichment;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -31,9 +33,7 @@ import org.apache.streampipes.sdk.helpers.Labels;
 import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import java.awt.BasicStroke;
diff --git a/streampipes-extensions/streampipes-processors-image-processing-jvm/src/main/java/org/apache/streampipes/processors/imageprocessing/jvm/processor/qrreader/QrCodeReaderProcessor.java b/streampipes-extensions/streampipes-processors-image-processing-jvm/src/main/java/org/apache/streampipes/processors/imageprocessing/jvm/processor/qrreader/QrCodeReaderProcessor.java
index 1e9d7b5a3..ab8e7272c 100644
--- a/streampipes-extensions/streampipes-processors-image-processing-jvm/src/main/java/org/apache/streampipes/processors/imageprocessing/jvm/processor/qrreader/QrCodeReaderProcessor.java
+++ b/streampipes-extensions/streampipes-processors-image-processing-jvm/src/main/java/org/apache/streampipes/processors/imageprocessing/jvm/processor/qrreader/QrCodeReaderProcessor.java
@@ -18,6 +18,8 @@
 package org.apache.streampipes.processors.imageprocessing.jvm.processor.qrreader;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -34,9 +36,7 @@ import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.Options;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import boofcv.abst.fiducial.QrCodeDetector;
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/pom.xml b/streampipes-extensions/streampipes-processors-pattern-detection-flink/pom.xml
index a421bd4cc..d3e1d6ed0 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/pom.xml
+++ b/streampipes-extensions/streampipes-processors-pattern-detection-flink/pom.xml
@@ -62,11 +62,11 @@
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-cep_2.11</artifactId>
+            <artifactId>flink-cep</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-runtime_2.11</artifactId>
+            <artifactId>flink-runtime</artifactId>
         </dependency>
         <dependency>
             <groupId>org.scala-lang</groupId>
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/AbstractPatternDetectionProgram.java b/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/AbstractPatternDetectionProgram.java
index 84716b9d4..5ce132910 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/AbstractPatternDetectionProgram.java
+++ b/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/AbstractPatternDetectionProgram.java
@@ -17,35 +17,17 @@
  */
 package org.apache.streampipes.processors.pattern.detection.flink;
 
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
-import org.apache.streampipes.processors.pattern.detection.flink.config.ConfigKeys;
-import org.apache.streampipes.svcdiscovery.api.SpConfig;
-import org.apache.streampipes.wrapper.flink.FlinkDataProcessorRuntime;
-import org.apache.streampipes.wrapper.flink.FlinkDeploymentConfig;
-import org.apache.streampipes.wrapper.params.binding.EventProcessorBindingParams;
+import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 
 import org.apache.flink.streaming.api.TimeCharacteristic;
 import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
 
-public abstract class AbstractPatternDetectionProgram<T extends EventProcessorBindingParams>
-    extends FlinkDataProcessorRuntime<T> {
+public abstract class AbstractPatternDetectionProgram<T extends ProcessorParams>
+    extends FlinkDataProcessorProgram<T> {
 
-  public AbstractPatternDetectionProgram(T params,
-                                         ConfigExtractor configExtractor,
-                                         StreamPipesClient streamPipesClient) {
-    super(params, configExtractor, streamPipesClient);
-  }
-
-  @Override
-  protected FlinkDeploymentConfig getDeploymentConfig(ConfigExtractor configExtractor) {
-    SpConfig config = configExtractor.getConfig();
-    return new FlinkDeploymentConfig(config.getString(
-        ConfigKeys.FLINK_JAR_FILE_LOC),
-        config.getString(ConfigKeys.FLINK_HOST),
-        config.getInteger(ConfigKeys.FLINK_PORT),
-        config.getBoolean(ConfigKeys.DEBUG)
-    );
+  public AbstractPatternDetectionProgram(T params) {
+    super(params);
   }
 
   @Override
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/absence/AbsenceController.java b/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/absence/AbsenceController.java
index 518843e37..fdf3834f2 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/absence/AbsenceController.java
+++ b/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/absence/AbsenceController.java
@@ -18,8 +18,6 @@
 
 package org.apache.streampipes.processors.pattern.detection.flink.processor.absence;
 
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
@@ -35,7 +33,7 @@ import org.apache.streampipes.sdk.helpers.Options;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.wrapper.flink.FlinkDataProcessorDeclarer;
-import org.apache.streampipes.wrapper.flink.FlinkDataProcessorRuntime;
+import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -67,10 +65,8 @@ public class AbsenceController extends FlinkDataProcessorDeclarer<AbsenceParamet
   }
 
   @Override
-  public FlinkDataProcessorRuntime<AbsenceParameters> getRuntime(DataProcessorInvocation graph,
-                                                                 ProcessingElementParameterExtractor extractor,
-                                                                 ConfigExtractor configExtractor,
-                                                                 StreamPipesClient streamPipesClient) {
+  public FlinkDataProcessorProgram<AbsenceParameters> getProgram(DataProcessorInvocation graph,
+                                                                 ProcessingElementParameterExtractor extractor) {
     List<String> selectProperties = new ArrayList<>();
     for (EventProperty p : graph.getOutputStream().getEventSchema().getEventProperties()) {
       selectProperties.add(p.getRuntimeName());
@@ -81,6 +77,6 @@ public class AbsenceController extends FlinkDataProcessorDeclarer<AbsenceParamet
 
     AbsenceParameters params = new AbsenceParameters(graph, selectProperties, timeWindow, timeUnit);
 
-    return new AbsenceProgram(params, configExtractor, streamPipesClient);
+    return new AbsenceProgram(params);
   }
 }
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/absence/AbsenceParameters.java b/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/absence/AbsenceParameters.java
index 39d005ffb..3302da441 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/absence/AbsenceParameters.java
+++ b/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/absence/AbsenceParameters.java
@@ -20,12 +20,12 @@ package org.apache.streampipes.processors.pattern.detection.flink.processor.abse
 
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
 import org.apache.streampipes.processors.pattern.detection.flink.processor.and.TimeUnit;
-import org.apache.streampipes.wrapper.params.binding.EventProcessorBindingParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class AbsenceParameters extends EventProcessorBindingParams {
+public class AbsenceParameters extends ProcessorParams {
 
   private static final long serialVersionUID = 4319341875274736697L;
 
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/absence/AbsenceProgram.java b/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/absence/AbsenceProgram.java
index fc2eaa0f2..d67c5b0d3 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/absence/AbsenceProgram.java
+++ b/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/absence/AbsenceProgram.java
@@ -17,11 +17,9 @@
  */
 package org.apache.streampipes.processors.pattern.detection.flink.processor.absence;
 
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
 import org.apache.streampipes.model.runtime.Event;
-import org.apache.streampipes.processors.pattern.detection.flink.AbstractPatternDetectionProgram;
 import org.apache.streampipes.processors.pattern.detection.flink.processor.and.TimeUnitConverter;
+import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
 
 import org.apache.flink.api.common.functions.FlatMapFunction;
 import org.apache.flink.api.java.tuple.Tuple2;
@@ -40,12 +38,10 @@ import org.apache.flink.util.OutputTag;
 import java.util.List;
 import java.util.Map;
 
-public class AbsenceProgram extends AbstractPatternDetectionProgram<AbsenceParameters> {
+public class AbsenceProgram extends FlinkDataProcessorProgram<AbsenceParameters> {
 
-  public AbsenceProgram(AbsenceParameters params,
-                        ConfigExtractor configExtractor,
-                        StreamPipesClient streamPipesClient) {
-    super(params, configExtractor, streamPipesClient);
+  public AbsenceProgram(AbsenceParameters params) {
+    super(params);
   }
 
   @Override
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/AndController.java b/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/AndController.java
index 380d08556..72d0d9184 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/AndController.java
+++ b/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/AndController.java
@@ -18,8 +18,6 @@
 
 package org.apache.streampipes.processors.pattern.detection.flink.processor.and;
 
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
@@ -34,7 +32,7 @@ import org.apache.streampipes.sdk.helpers.Options;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.wrapper.flink.FlinkDataProcessorDeclarer;
-import org.apache.streampipes.wrapper.flink.FlinkDataProcessorRuntime;
+import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
 
 import java.util.List;
 
@@ -72,17 +70,15 @@ public class AndController extends FlinkDataProcessorDeclarer<AndParameters> {
 
 
   @Override
-  public FlinkDataProcessorRuntime<AndParameters> getRuntime(DataProcessorInvocation graph,
-                                                             ProcessingElementParameterExtractor extractor,
-                                                             ConfigExtractor configExtractor,
-                                                             StreamPipesClient streamPipesClient) {
+  public FlinkDataProcessorProgram<AndParameters> getProgram(DataProcessorInvocation graph,
+                                                             ProcessingElementParameterExtractor extractor) {
     List<String> leftMappings = extractor.mappingPropertyValues(LEFT_MAPPING);
     List<String> rightMappings = extractor.mappingPropertyValues(RIGHT_MAPPING);
     TimeUnit timeUnit = TimeUnit.valueOf(extractor.selectedSingleValue(TIME_UNIT, String.class));
     Integer timeWindow = extractor.singleValueParameter(TIME_WINDOW, Integer.class);
 
     AndParameters params = new AndParameters(graph, timeUnit, timeWindow, leftMappings, rightMappings);
-    return new AndProgram(params, configExtractor, streamPipesClient);
+    return new AndProgram(params);
 
   }
 }
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/AndParameters.java b/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/AndParameters.java
index bd8f9896e..81e523f05 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/AndParameters.java
+++ b/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/AndParameters.java
@@ -19,11 +19,11 @@
 package org.apache.streampipes.processors.pattern.detection.flink.processor.and;
 
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
-import org.apache.streampipes.wrapper.params.binding.EventProcessorBindingParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 
 import java.util.List;
 
-public class AndParameters extends EventProcessorBindingParams {
+public class AndParameters extends ProcessorParams {
 
   private TimeUnit timeUnit;
   private Integer timeWindow;
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/AndProgram.java b/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/AndProgram.java
index 53a7bed45..7b0573caf 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/AndProgram.java
+++ b/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/and/AndProgram.java
@@ -17,8 +17,6 @@
  */
 package org.apache.streampipes.processors.pattern.detection.flink.processor.and;
 
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
 import org.apache.streampipes.model.runtime.Event;
 import org.apache.streampipes.processors.pattern.detection.flink.AbstractPatternDetectionProgram;
 
@@ -33,10 +31,8 @@ import java.util.List;
 
 public class AndProgram extends AbstractPatternDetectionProgram<AndParameters> {
 
-  public AndProgram(AndParameters params,
-                    ConfigExtractor configExtractor,
-                    StreamPipesClient streamPipesClient) {
-    super(params, configExtractor, streamPipesClient);
+  public AndProgram(AndParameters params) {
+    super(params);
   }
 
   @Override
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/peak/PeakDetectionController.java b/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/peak/PeakDetectionController.java
index 99a7d81d1..22fa3b42f 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/peak/PeakDetectionController.java
+++ b/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/peak/PeakDetectionController.java
@@ -18,8 +18,6 @@
 
 package org.apache.streampipes.processors.pattern.detection.flink.processor.peak;
 
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
@@ -34,7 +32,7 @@ import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.wrapper.flink.FlinkDataProcessorDeclarer;
-import org.apache.streampipes.wrapper.flink.FlinkDataProcessorRuntime;
+import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
 
 public class PeakDetectionController extends FlinkDataProcessorDeclarer<PeakDetectionParameters> {
 
@@ -72,10 +70,8 @@ public class PeakDetectionController extends FlinkDataProcessorDeclarer<PeakDete
   }
 
   @Override
-  public FlinkDataProcessorRuntime<PeakDetectionParameters> getRuntime(DataProcessorInvocation sepa,
-                                                                       ProcessingElementParameterExtractor extractor,
-                                                                       ConfigExtractor configExtractor,
-                                                                       StreamPipesClient streamPipesClient) {
+  public FlinkDataProcessorProgram<PeakDetectionParameters> getProgram(DataProcessorInvocation sepa,
+                                                                       ProcessingElementParameterExtractor extractor) {
     String valueToObserve = extractor.mappingPropertyValue(VALUE_TO_OBSERVE);
     String timestampMapping = extractor.mappingPropertyValue(TIMESTAMP_MAPPING);
     String groupBy = extractor.mappingPropertyValue(PARTITION_BY);
@@ -90,6 +86,6 @@ public class PeakDetectionController extends FlinkDataProcessorDeclarer<PeakDete
     PeakDetectionParameters params = new PeakDetectionParameters(sepa,
         valueToObserve, timestampMapping, groupBy, countWindowSize, lag, threshold, influence);
 
-    return new PeakDetectionProgram(params, configExtractor, streamPipesClient);
+    return new PeakDetectionProgram(params);
   }
 }
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/peak/PeakDetectionParameters.java b/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/peak/PeakDetectionParameters.java
index 472d31e21..3026a45a9 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/peak/PeakDetectionParameters.java
+++ b/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/peak/PeakDetectionParameters.java
@@ -19,14 +19,14 @@
 package org.apache.streampipes.processors.pattern.detection.flink.processor.peak;
 
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
-import org.apache.streampipes.wrapper.params.binding.EventProcessorBindingParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 
 import java.io.Serializable;
 
 /**
  * Created by riemer on 20.04.2017.
  */
-public class PeakDetectionParameters extends EventProcessorBindingParams implements Serializable {
+public class PeakDetectionParameters extends ProcessorParams implements Serializable {
 
   private String valueToObserve;
   private String timestampMapping;
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/peak/PeakDetectionProgram.java b/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/peak/PeakDetectionProgram.java
index 227a0d203..dcabe7ad8 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/peak/PeakDetectionProgram.java
+++ b/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/peak/PeakDetectionProgram.java
@@ -18,8 +18,6 @@
 
 package org.apache.streampipes.processors.pattern.detection.flink.processor.peak;
 
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
 import org.apache.streampipes.model.runtime.Event;
 import org.apache.streampipes.processors.pattern.detection.flink.AbstractPatternDetectionProgram;
 import org.apache.streampipes.processors.pattern.detection.flink.processor.peak.utils.SlidingBatchWindow;
@@ -36,14 +34,12 @@ import java.util.List;
  */
 public class PeakDetectionProgram extends AbstractPatternDetectionProgram<PeakDetectionParameters> {
 
-  public PeakDetectionProgram(PeakDetectionParameters params,
-                              ConfigExtractor configExtractor,
-                              StreamPipesClient streamPipesClient) {
-    super(params, configExtractor, streamPipesClient);
+  public PeakDetectionProgram(PeakDetectionParameters params) {
+    super(params);
   }
 
   @Override
-  protected DataStream<Event> getApplicationLogic(DataStream<Event>[] messageStream) {
+  public DataStream<Event> getApplicationLogic(DataStream<Event>[] messageStream) {
 
     Integer lag = params.getLag();
     String groupBy = params.getGroupBy();
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/sequence/SequenceController.java b/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/sequence/SequenceController.java
index ab16eba20..620c28da3 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/sequence/SequenceController.java
+++ b/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/sequence/SequenceController.java
@@ -18,8 +18,6 @@
 
 package org.apache.streampipes.processors.pattern.detection.flink.processor.sequence;
 
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
@@ -33,7 +31,7 @@ import org.apache.streampipes.sdk.helpers.Options;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.wrapper.flink.FlinkDataProcessorDeclarer;
-import org.apache.streampipes.wrapper.flink.FlinkDataProcessorRuntime;
+import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
 
 public class SequenceController extends FlinkDataProcessorDeclarer<SequenceParameters> {
 
@@ -56,17 +54,15 @@ public class SequenceController extends FlinkDataProcessorDeclarer<SequenceParam
   }
 
   @Override
-  public FlinkDataProcessorRuntime<SequenceParameters> getRuntime(DataProcessorInvocation graph,
-                                                                  ProcessingElementParameterExtractor extractor,
-                                                                  ConfigExtractor configExtractor,
-                                                                  StreamPipesClient streamPipesClient) {
+  public FlinkDataProcessorProgram<SequenceParameters> getProgram(DataProcessorInvocation graph,
+                                                                  ProcessingElementParameterExtractor extractor) {
 
     Integer timeWindowSize = extractor.singleValueParameter(TIME_WINDOW, Integer.class);
     String timeUnit = extractor.selectedSingleValue(TIME_UNIT, String.class);
 
     SequenceParameters params = new SequenceParameters(graph, timeWindowSize, timeUnit);
 
-    return new SequenceProgram(params, configExtractor, streamPipesClient);
+    return new SequenceProgram(params);
 
   }
 }
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/sequence/SequenceParameters.java b/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/sequence/SequenceParameters.java
index 9dc73a19f..e98aab018 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/sequence/SequenceParameters.java
+++ b/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/sequence/SequenceParameters.java
@@ -19,9 +19,9 @@
 package org.apache.streampipes.processors.pattern.detection.flink.processor.sequence;
 
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
-import org.apache.streampipes.wrapper.params.binding.EventProcessorBindingParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 
-public class SequenceParameters extends EventProcessorBindingParams {
+public class SequenceParameters extends ProcessorParams {
 
   private Integer timeWindow;
   private String timeUnit;
diff --git a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/sequence/SequenceProgram.java b/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/sequence/SequenceProgram.java
index 80aecec31..e798ede29 100644
--- a/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/sequence/SequenceProgram.java
+++ b/streampipes-extensions/streampipes-processors-pattern-detection-flink/src/main/java/org/apache/streampipes/processors/pattern/detection/flink/processor/sequence/SequenceProgram.java
@@ -18,8 +18,6 @@
 
 package org.apache.streampipes.processors.pattern.detection.flink.processor.sequence;
 
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
 import org.apache.streampipes.model.runtime.Event;
 import org.apache.streampipes.processors.pattern.detection.flink.AbstractPatternDetectionProgram;
 
@@ -28,14 +26,12 @@ import org.apache.flink.streaming.api.datastream.DataStream;
 
 public class SequenceProgram extends AbstractPatternDetectionProgram<SequenceParameters> {
 
-  public SequenceProgram(SequenceParameters params,
-                         ConfigExtractor configExtractor,
-                         StreamPipesClient streamPipesClient) {
-    super(params, configExtractor, streamPipesClient);
+  public SequenceProgram(SequenceParameters params) {
+    super(params);
   }
 
   @Override
-  protected DataStream<Event> getApplicationLogic(DataStream<Event>... dataStreams) {
+  public DataStream<Event> getApplicationLogic(DataStream<Event>... dataStreams) {
     return dataStreams[0].keyBy(getKeySelector()).connect(dataStreams[1].keyBy(getKeySelector()))
         .process(new Sequence(params
             .getTimeUnit(),
@@ -45,11 +41,6 @@ public class SequenceProgram extends AbstractPatternDetectionProgram<SequencePar
   }
 
   private KeySelector<Event, String> getKeySelector() {
-    return new KeySelector<Event, String>() {
-      @Override
-      public String getKey(Event value) throws Exception {
-        return "dummy-key";
-      }
-    };
+    return value -> "dummy-key";
   }
 }
diff --git a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/AbstractStatisticsProgram.java b/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/AbstractStatisticsProgram.java
deleted file mode 100644
index 8d8c9609a..000000000
--- a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/AbstractStatisticsProgram.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.streampipes.processors.statistics.flink;
-
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
-import org.apache.streampipes.processors.statistics.flink.config.ConfigKeys;
-import org.apache.streampipes.svcdiscovery.api.SpConfig;
-import org.apache.streampipes.wrapper.flink.FlinkDataProcessorRuntime;
-import org.apache.streampipes.wrapper.flink.FlinkDeploymentConfig;
-import org.apache.streampipes.wrapper.params.binding.EventProcessorBindingParams;
-
-public abstract class AbstractStatisticsProgram<T extends EventProcessorBindingParams>
-    extends FlinkDataProcessorRuntime<T> {
-
-  public AbstractStatisticsProgram(T params,
-                                   ConfigExtractor configExtractor,
-                                   StreamPipesClient streamPipesClient) {
-    super(params, configExtractor, streamPipesClient);
-  }
-
-  @Override
-  protected FlinkDeploymentConfig getDeploymentConfig(ConfigExtractor configExtractor) {
-    SpConfig config = configExtractor.getConfig();
-    return new FlinkDeploymentConfig(config.getString(
-        ConfigKeys.FLINK_JAR_FILE_LOC),
-        config.getString(ConfigKeys.FLINK_HOST),
-        config.getInteger(ConfigKeys.FLINK_PORT),
-        config.getBoolean(ConfigKeys.DEBUG)
-    );
-  }
-
-}
-
diff --git a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/summary/StatisticsSummaryController.java b/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/summary/StatisticsSummaryController.java
index 950df07bc..71985c3e5 100644
--- a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/summary/StatisticsSummaryController.java
+++ b/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/summary/StatisticsSummaryController.java
@@ -18,10 +18,8 @@
 
 package org.apache.streampipes.processors.statistics.flink.processor.stat.summary;
 
-import org.apache.streampipes.client.StreamPipesClient;
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
 import org.apache.streampipes.extensions.api.runtime.ResolvesContainerProvidedOutputStrategy;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
 import org.apache.streampipes.model.schema.EventSchema;
@@ -38,7 +36,7 @@ import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.sdk.utils.Datatypes;
 import org.apache.streampipes.vocabulary.Statistics;
 import org.apache.streampipes.wrapper.flink.FlinkDataProcessorDeclarer;
-import org.apache.streampipes.wrapper.flink.FlinkDataProcessorRuntime;
+import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
 
 import org.apache.commons.lang3.StringUtils;
 
@@ -73,16 +71,14 @@ public class StatisticsSummaryController extends FlinkDataProcessorDeclarer<Stat
   }
 
   @Override
-  public FlinkDataProcessorRuntime<StatisticsSummaryParameters> getRuntime(
+  public FlinkDataProcessorProgram<StatisticsSummaryParameters> getProgram(
       DataProcessorInvocation graph,
-      ProcessingElementParameterExtractor extractor,
-      ConfigExtractor configExtractor,
-      StreamPipesClient streamPipesClient) {
+      ProcessingElementParameterExtractor extractor) {
     List<String> listPropertyMappings = extractor.mappingPropertyValues(listPropertyMappingName);
 
     StatisticsSummaryParameters params = new StatisticsSummaryParameters(graph, listPropertyMappings);
 
-    return new StatisticsSummaryProgram(params, configExtractor, streamPipesClient);
+    return new StatisticsSummaryProgram(params);
 
   }
 
diff --git a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/summary/StatisticsSummaryParameters.java b/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/summary/StatisticsSummaryParameters.java
index f2e92f5b0..aaebc2f91 100644
--- a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/summary/StatisticsSummaryParameters.java
+++ b/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/summary/StatisticsSummaryParameters.java
@@ -19,11 +19,11 @@
 package org.apache.streampipes.processors.statistics.flink.processor.stat.summary;
 
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
-import org.apache.streampipes.wrapper.params.binding.EventProcessorBindingParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 
 import java.util.List;
 
-public class StatisticsSummaryParameters extends EventProcessorBindingParams {
+public class StatisticsSummaryParameters extends ProcessorParams {
 
   private List<String> listPropertyMappings;
 
diff --git a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/summary/StatisticsSummaryProgram.java b/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/summary/StatisticsSummaryProgram.java
index 0a25e5abe..082ca5092 100644
--- a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/summary/StatisticsSummaryProgram.java
+++ b/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/summary/StatisticsSummaryProgram.java
@@ -18,23 +18,19 @@
 
 package org.apache.streampipes.processors.statistics.flink.processor.stat.summary;
 
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
 import org.apache.streampipes.model.runtime.Event;
-import org.apache.streampipes.processors.statistics.flink.AbstractStatisticsProgram;
+import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
 
 import org.apache.flink.streaming.api.datastream.DataStream;
 
-public class StatisticsSummaryProgram extends AbstractStatisticsProgram<StatisticsSummaryParameters> {
+public class StatisticsSummaryProgram extends FlinkDataProcessorProgram<StatisticsSummaryParameters> {
 
-  public StatisticsSummaryProgram(StatisticsSummaryParameters params,
-                                  ConfigExtractor configExtractor,
-                                  StreamPipesClient streamPipesClient) {
-    super(params, configExtractor, streamPipesClient);
+  public StatisticsSummaryProgram(StatisticsSummaryParameters params) {
+    super(params);
   }
 
   @Override
-  protected DataStream<Event> getApplicationLogic(DataStream<Event>... messageStream) {
-    return messageStream[0].flatMap(new StatisticsSummaryCalculator(bindingParams.getListPropertyMappings()));
+  public DataStream<Event> getApplicationLogic(DataStream<Event>... messageStream) {
+    return messageStream[0].flatMap(new StatisticsSummaryCalculator(params.getListPropertyMappings()));
   }
 }
diff --git a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/window/StatisticsSummaryControllerWindow.java b/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/window/StatisticsSummaryControllerWindow.java
index aff34db69..98c9f3fe1 100644
--- a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/window/StatisticsSummaryControllerWindow.java
+++ b/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/window/StatisticsSummaryControllerWindow.java
@@ -18,8 +18,6 @@
 
 package org.apache.streampipes.processors.statistics.flink.processor.stat.window;
 
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
 import org.apache.streampipes.model.schema.PropertyScope;
@@ -36,7 +34,7 @@ import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.vocabulary.Statistics;
 import org.apache.streampipes.wrapper.flink.FlinkDataProcessorDeclarer;
-import org.apache.streampipes.wrapper.flink.FlinkDataProcessorRuntime;
+import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
 
 import java.util.concurrent.TimeUnit;
 
@@ -82,11 +80,9 @@ public class StatisticsSummaryControllerWindow extends
   }
 
   @Override
-  public FlinkDataProcessorRuntime<StatisticsSummaryParametersWindow> getRuntime(
+  public FlinkDataProcessorProgram<StatisticsSummaryParametersWindow> getProgram(
       DataProcessorInvocation sepa,
-      ProcessingElementParameterExtractor extractor,
-      ConfigExtractor configExtractor,
-      StreamPipesClient streamPipesClient) {
+      ProcessingElementParameterExtractor extractor) {
 
     String valueToObserve = extractor.mappingPropertyValue(VALUE_TO_OBSERVE);
     String timestampMapping = extractor.mappingPropertyValue(TIMESTAMP_MAPPING);
@@ -116,7 +112,7 @@ public class StatisticsSummaryControllerWindow extends
         (long) timeWindowSize,
         timeUnit);
 
-    return new StatisticsSummaryProgramWindow(params, serializableParams, configExtractor, streamPipesClient);
+    return new StatisticsSummaryProgramWindow(params, serializableParams);
 
   }
 }
diff --git a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/window/StatisticsSummaryParametersWindow.java b/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/window/StatisticsSummaryParametersWindow.java
index 1e7215811..a07640fb1 100644
--- a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/window/StatisticsSummaryParametersWindow.java
+++ b/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/window/StatisticsSummaryParametersWindow.java
@@ -19,11 +19,11 @@
 package org.apache.streampipes.processors.statistics.flink.processor.stat.window;
 
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
-import org.apache.streampipes.wrapper.params.binding.EventProcessorBindingParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 
 import java.util.concurrent.TimeUnit;
 
-public class StatisticsSummaryParametersWindow extends EventProcessorBindingParams {
+public class StatisticsSummaryParametersWindow extends ProcessorParams {
 
   private String valueToObserve;
   private String timestampMapping;
diff --git a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/window/StatisticsSummaryProgramWindow.java b/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/window/StatisticsSummaryProgramWindow.java
index 9185cf362..16ccf8982 100644
--- a/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/window/StatisticsSummaryProgramWindow.java
+++ b/streampipes-extensions/streampipes-processors-statistics-flink/src/main/java/org/apache/streampipes/processors/statistics/flink/processor/stat/window/StatisticsSummaryProgramWindow.java
@@ -18,37 +18,32 @@
 
 package org.apache.streampipes.processors.statistics.flink.processor.stat.window;
 
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
 import org.apache.streampipes.model.runtime.Event;
-import org.apache.streampipes.processors.statistics.flink.AbstractStatisticsProgram;
 import org.apache.streampipes.processors.statistics.flink.extensions.MapKeySelector;
 import org.apache.streampipes.processors.statistics.flink.extensions.SlidingEventTimeWindow;
 import org.apache.streampipes.processors.statistics.flink.extensions.TimestampMappingFunction;
+import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
 
 import org.apache.flink.api.common.typeinfo.TypeHint;
 import org.apache.flink.api.common.typeinfo.TypeInformation;
-import org.apache.flink.streaming.api.TimeCharacteristic;
 import org.apache.flink.streaming.api.datastream.DataStream;
 
 import java.util.List;
 
 public class StatisticsSummaryProgramWindow extends
-    AbstractStatisticsProgram<StatisticsSummaryParametersWindow> {
+    FlinkDataProcessorProgram<StatisticsSummaryParametersWindow> {
 
   private StatisticsSummaryParamsSerializable serializableParams;
 
   public StatisticsSummaryProgramWindow(StatisticsSummaryParametersWindow params,
-                                        StatisticsSummaryParamsSerializable serializableParams,
-                                        ConfigExtractor configExtractor,
-                                        StreamPipesClient streamPipesClient) {
-    super(params, configExtractor, streamPipesClient);
-    this.streamTimeCharacteristic = TimeCharacteristic.EventTime;
+                                        StatisticsSummaryParamsSerializable serializableParams) {
+    super(params);
+    //this.streamTimeCharacteristic = TimeCharacteristic.EventTime;
     this.serializableParams = serializableParams;
   }
 
   @Override
-  protected DataStream<Event> getApplicationLogic(DataStream<Event>... messageStream) {
+  public DataStream<Event> getApplicationLogic(DataStream<Event>... messageStream) {
 
     StatisticsSummaryParamsSerializable sp = new
         StatisticsSummaryParamsSerializable(serializableParams.getValueToObserve(),
diff --git a/streampipes-extensions/streampipes-processors-text-mining-flink/pom.xml b/streampipes-extensions/streampipes-processors-text-mining-flink/pom.xml
index ee1c8d57d..d47e1d1fa 100644
--- a/streampipes-extensions/streampipes-processors-text-mining-flink/pom.xml
+++ b/streampipes-extensions/streampipes-processors-text-mining-flink/pom.xml
@@ -51,7 +51,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-cep-scala_2.11</artifactId>
+            <artifactId>flink-cep</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
diff --git a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/AbstractTextMiningProgram.java b/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/AbstractTextMiningProgram.java
deleted file mode 100644
index 450b65a24..000000000
--- a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/AbstractTextMiningProgram.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.streampipes.processors.textmining.flink;
-
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
-import org.apache.streampipes.processors.textmining.flink.config.ConfigKeys;
-import org.apache.streampipes.svcdiscovery.api.SpConfig;
-import org.apache.streampipes.wrapper.flink.FlinkDataProcessorRuntime;
-import org.apache.streampipes.wrapper.flink.FlinkDeploymentConfig;
-import org.apache.streampipes.wrapper.params.binding.EventProcessorBindingParams;
-
-public abstract class AbstractTextMiningProgram<T extends EventProcessorBindingParams>
-    extends FlinkDataProcessorRuntime<T> {
-
-  public AbstractTextMiningProgram(T params,
-                                   ConfigExtractor configExtractor,
-                                   StreamPipesClient streamPipesClient) {
-    super(params, configExtractor, streamPipesClient);
-  }
-
-  @Override
-  protected FlinkDeploymentConfig getDeploymentConfig(ConfigExtractor configExtractor) {
-    SpConfig config = configExtractor.getConfig();
-    return new FlinkDeploymentConfig(config.getString(
-        ConfigKeys.FLINK_JAR_FILE_LOC),
-        config.getString(ConfigKeys.FLINK_HOST),
-        config.getInteger(ConfigKeys.FLINK_PORT),
-        config.getBoolean(ConfigKeys.DEBUG)
-    );
-  }
-
-}
-
diff --git a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/language/LanguageDetectionController.java b/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/language/LanguageDetectionController.java
index 99183bedc..e6aa9a8c1 100644
--- a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/language/LanguageDetectionController.java
+++ b/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/language/LanguageDetectionController.java
@@ -17,8 +17,6 @@
  */
 package org.apache.streampipes.processors.textmining.flink.processor.language;
 
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
@@ -33,7 +31,7 @@ import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.wrapper.flink.FlinkDataProcessorDeclarer;
-import org.apache.streampipes.wrapper.flink.FlinkDataProcessorRuntime;
+import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
 
 public class LanguageDetectionController extends FlinkDataProcessorDeclarer<LanguageDetectionParameters> {
 
@@ -61,14 +59,11 @@ public class LanguageDetectionController extends FlinkDataProcessorDeclarer<Lang
   }
 
   @Override
-  public FlinkDataProcessorRuntime<LanguageDetectionParameters> getRuntime(
+  public FlinkDataProcessorProgram<LanguageDetectionParameters> getProgram(
       DataProcessorInvocation graph,
-      ProcessingElementParameterExtractor extractor,
-      ConfigExtractor configExtractor,
-      StreamPipesClient streamPipesClient) {
+      ProcessingElementParameterExtractor extractor) {
     String fieldName = extractor.mappingPropertyValue(DETECTION_FIELD_KEY);
 
-    return new LanguageDetectionProgram(new LanguageDetectionParameters(graph, fieldName), configExtractor,
-        streamPipesClient);
+    return new LanguageDetectionProgram(new LanguageDetectionParameters(graph, fieldName));
   }
 }
diff --git a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/language/LanguageDetectionParameters.java b/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/language/LanguageDetectionParameters.java
index 020ea5df4..7085982db 100644
--- a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/language/LanguageDetectionParameters.java
+++ b/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/language/LanguageDetectionParameters.java
@@ -18,9 +18,9 @@
 package org.apache.streampipes.processors.textmining.flink.processor.language;
 
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
-import org.apache.streampipes.wrapper.params.binding.EventProcessorBindingParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 
-public class LanguageDetectionParameters extends EventProcessorBindingParams {
+public class LanguageDetectionParameters extends ProcessorParams {
 
   private String fieldName;
 
diff --git a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/language/LanguageDetectionProgram.java b/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/language/LanguageDetectionProgram.java
index 59134c308..bf8de3071 100644
--- a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/language/LanguageDetectionProgram.java
+++ b/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/language/LanguageDetectionProgram.java
@@ -17,23 +17,19 @@
  */
 package org.apache.streampipes.processors.textmining.flink.processor.language;
 
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
 import org.apache.streampipes.model.runtime.Event;
-import org.apache.streampipes.processors.textmining.flink.AbstractTextMiningProgram;
+import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
 
 import org.apache.flink.streaming.api.datastream.DataStream;
 
-public class LanguageDetectionProgram extends AbstractTextMiningProgram<LanguageDetectionParameters> {
+public class LanguageDetectionProgram extends FlinkDataProcessorProgram<LanguageDetectionParameters> {
 
-  public LanguageDetectionProgram(LanguageDetectionParameters params,
-                                  ConfigExtractor configExtractor,
-                                  StreamPipesClient streamPipesClient) {
-    super(params, configExtractor, streamPipesClient);
+  public LanguageDetectionProgram(LanguageDetectionParameters params) {
+    super(params);
   }
 
   @Override
-  protected DataStream<Event> getApplicationLogic(DataStream<Event>... messageStream) {
+  public DataStream<Event> getApplicationLogic(DataStream<Event>... messageStream) {
     return messageStream[0]
         .flatMap(new LanguageDetection(params.getFieldName()));
   }
diff --git a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/sentiment/SentimentDetection.java b/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/sentiment/SentimentDetection.java
deleted file mode 100644
index d4d800a87..000000000
--- a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/sentiment/SentimentDetection.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.streampipes.processors.textmining.flink.processor.sentiment;
-
-public class SentimentDetection {
-}
diff --git a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/sentiment/SentimentDetectionController.java b/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/sentiment/SentimentDetectionController.java
deleted file mode 100644
index 663182358..000000000
--- a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/sentiment/SentimentDetectionController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.streampipes.processors.textmining.flink.processor.sentiment;
-
-public class SentimentDetectionController {
-}
diff --git a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/sentiment/SentimentDetectionProgram.java b/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/sentiment/SentimentDetectionProgram.java
deleted file mode 100644
index 5dbafaafa..000000000
--- a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/sentiment/SentimentDetectionProgram.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.streampipes.processors.textmining.flink.processor.sentiment;
-
-public class SentimentDetectionProgram {
-}
diff --git a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/wordcount/WordCountController.java b/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/wordcount/WordCountController.java
index 5a888ace8..afd3e686e 100644
--- a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/wordcount/WordCountController.java
+++ b/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/wordcount/WordCountController.java
@@ -18,8 +18,6 @@
 
 package org.apache.streampipes.processors.textmining.flink.processor.wordcount;
 
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
@@ -34,7 +32,7 @@ import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.wrapper.flink.FlinkDataProcessorDeclarer;
-import org.apache.streampipes.wrapper.flink.FlinkDataProcessorRuntime;
+import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
 
 public class WordCountController extends FlinkDataProcessorDeclarer<WordCountParameters> {
 
@@ -67,16 +65,13 @@ public class WordCountController extends FlinkDataProcessorDeclarer<WordCountPar
   }
 
   @Override
-  public FlinkDataProcessorRuntime<WordCountParameters> getRuntime(DataProcessorInvocation graph,
-                                                                   ProcessingElementParameterExtractor extractor,
-                                                                   ConfigExtractor configExtractor,
-                                                                   StreamPipesClient streamPipesClient) {
+  public FlinkDataProcessorProgram<WordCountParameters> getProgram(DataProcessorInvocation graph,
+                                                                   ProcessingElementParameterExtractor extractor) {
 
     String fieldName = extractor.mappingPropertyValue(WORD_COUNT_FIELD_KEY);
     Integer timeWindowValue = extractor.singleValueParameter(TIME_WINDOW_KEY, Integer.class);
 
-    return new WordCountProgram(new WordCountParameters(graph, fieldName, timeWindowValue), configExtractor,
-        streamPipesClient);
+    return new WordCountProgram(new WordCountParameters(graph, fieldName, timeWindowValue));
 
   }
 }
diff --git a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/wordcount/WordCountParameters.java b/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/wordcount/WordCountParameters.java
index ea91058cc..331be63f8 100644
--- a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/wordcount/WordCountParameters.java
+++ b/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/wordcount/WordCountParameters.java
@@ -19,9 +19,9 @@
 package org.apache.streampipes.processors.textmining.flink.processor.wordcount;
 
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
-import org.apache.streampipes.wrapper.params.binding.EventProcessorBindingParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 
-public class WordCountParameters extends EventProcessorBindingParams {
+public class WordCountParameters extends ProcessorParams {
 
   private String wordCountFieldName;
   private Integer timeWindowValue;
diff --git a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/wordcount/WordCountProgram.java b/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/wordcount/WordCountProgram.java
index 0c684b84e..e6384df3d 100644
--- a/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/wordcount/WordCountProgram.java
+++ b/streampipes-extensions/streampipes-processors-text-mining-flink/src/main/java/org/apache/streampipes/processors/textmining/flink/processor/wordcount/WordCountProgram.java
@@ -18,29 +18,25 @@
 
 package org.apache.streampipes.processors.textmining.flink.processor.wordcount;
 
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
 import org.apache.streampipes.model.runtime.Event;
-import org.apache.streampipes.processors.textmining.flink.AbstractTextMiningProgram;
+import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
 
 import org.apache.flink.streaming.api.datastream.DataStream;
 
 import java.io.Serializable;
 
-public class WordCountProgram extends AbstractTextMiningProgram<WordCountParameters> implements Serializable {
+public class WordCountProgram extends FlinkDataProcessorProgram<WordCountParameters> implements Serializable {
 
-  public WordCountProgram(WordCountParameters params,
-                          ConfigExtractor configExtractor,
-                          StreamPipesClient streamPipesClient) {
-    super(params, configExtractor, streamPipesClient);
+  public WordCountProgram(WordCountParameters params) {
+    super(params);
   }
 
   @Override
-  protected DataStream<Event> getApplicationLogic(
+  public DataStream<Event> getApplicationLogic(
       DataStream<Event>... messageStream) {
 
     return messageStream[0]
-        .flatMap(new WordSplitter(bindingParams.getWordCountFieldName()))
+        .flatMap(new WordSplitter(params.getWordCountFieldName()))
         .keyBy("word")
         .sum("count")
         .flatMap(new WordToEventConverter());
diff --git a/streampipes-extensions/streampipes-processors-text-mining-jvm/src/main/java/org/apache/streampipes/processors/textmining/jvm/processor/chunker/ChunkerProcessor.java b/streampipes-extensions/streampipes-processors-text-mining-jvm/src/main/java/org/apache/streampipes/processors/textmining/jvm/processor/chunker/ChunkerProcessor.java
index 9b1ef12aa..be8165468 100644
--- a/streampipes-extensions/streampipes-processors-text-mining-jvm/src/main/java/org/apache/streampipes/processors/textmining/jvm/processor/chunker/ChunkerProcessor.java
+++ b/streampipes-extensions/streampipes-processors-text-mining-jvm/src/main/java/org/apache/streampipes/processors/textmining/jvm/processor/chunker/ChunkerProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.textmining.jvm.processor.chunker;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -34,9 +36,7 @@ import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.sdk.utils.Datatypes;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import opennlp.tools.chunker.ChunkerME;
diff --git a/streampipes-extensions/streampipes-processors-text-mining-jvm/src/main/java/org/apache/streampipes/processors/textmining/jvm/processor/language/LanguageDetectionProcessor.java b/streampipes-extensions/streampipes-processors-text-mining-jvm/src/main/java/org/apache/streampipes/processors/textmining/jvm/processor/language/LanguageDetectionProcessor.java
index e970112f4..862e61552 100644
--- a/streampipes-extensions/streampipes-processors-text-mining-jvm/src/main/java/org/apache/streampipes/processors/textmining/jvm/processor/language/LanguageDetectionProcessor.java
+++ b/streampipes-extensions/streampipes-processors-text-mining-jvm/src/main/java/org/apache/streampipes/processors/textmining/jvm/processor/language/LanguageDetectionProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.textmining.jvm.processor.language;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -31,9 +33,7 @@ import org.apache.streampipes.sdk.helpers.Labels;
 import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import opennlp.tools.langdetect.Language;
diff --git a/streampipes-extensions/streampipes-processors-text-mining-jvm/src/main/java/org/apache/streampipes/processors/textmining/jvm/processor/namefinder/NameFinderProcessor.java b/streampipes-extensions/streampipes-processors-text-mining-jvm/src/main/java/org/apache/streampipes/processors/textmining/jvm/processor/namefinder/NameFinderProcessor.java
index 30d9ef1a0..0cbdc32d2 100644
--- a/streampipes-extensions/streampipes-processors-text-mining-jvm/src/main/java/org/apache/streampipes/processors/textmining/jvm/processor/namefinder/NameFinderProcessor.java
+++ b/streampipes-extensions/streampipes-processors-text-mining-jvm/src/main/java/org/apache/streampipes/processors/textmining/jvm/processor/namefinder/NameFinderProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.textmining.jvm.processor.namefinder;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -34,9 +36,7 @@ import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.sdk.utils.Datatypes;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import opennlp.tools.namefind.NameFinderME;
diff --git a/streampipes-extensions/streampipes-processors-text-mining-jvm/src/main/java/org/apache/streampipes/processors/textmining/jvm/processor/partofspeech/PartOfSpeechProcessor.java b/streampipes-extensions/streampipes-processors-text-mining-jvm/src/main/java/org/apache/streampipes/processors/textmining/jvm/processor/partofspeech/PartOfSpeechProcessor.java
index d58cc6703..5ef053c8f 100644
--- a/streampipes-extensions/streampipes-processors-text-mining-jvm/src/main/java/org/apache/streampipes/processors/textmining/jvm/processor/partofspeech/PartOfSpeechProcessor.java
+++ b/streampipes-extensions/streampipes-processors-text-mining-jvm/src/main/java/org/apache/streampipes/processors/textmining/jvm/processor/partofspeech/PartOfSpeechProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.textmining.jvm.processor.partofspeech;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -33,9 +35,7 @@ import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.sdk.utils.Datatypes;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import opennlp.tools.postag.POSModel;
diff --git a/streampipes-extensions/streampipes-processors-text-mining-jvm/src/main/java/org/apache/streampipes/processors/textmining/jvm/processor/sentencedetection/SentenceDetectionProcessor.java b/streampipes-extensions/streampipes-processors-text-mining-jvm/src/main/java/org/apache/streampipes/processors/textmining/jvm/processor/sentencedetection/SentenceDetectionProcessor.java
index 852a04131..ae997b8cf 100644
--- a/streampipes-extensions/streampipes-processors-text-mining-jvm/src/main/java/org/apache/streampipes/processors/textmining/jvm/processor/sentencedetection/SentenceDetectionProcessor.java
+++ b/streampipes-extensions/streampipes-processors-text-mining-jvm/src/main/java/org/apache/streampipes/processors/textmining/jvm/processor/sentencedetection/SentenceDetectionProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.textmining.jvm.processor.sentencedetection;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -30,9 +32,7 @@ import org.apache.streampipes.sdk.helpers.Labels;
 import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import opennlp.tools.sentdetect.SentenceDetectorME;
diff --git a/streampipes-extensions/streampipes-processors-text-mining-jvm/src/main/java/org/apache/streampipes/processors/textmining/jvm/processor/tokenizer/TokenizerProcessor.java b/streampipes-extensions/streampipes-processors-text-mining-jvm/src/main/java/org/apache/streampipes/processors/textmining/jvm/processor/tokenizer/TokenizerProcessor.java
index 7c2e05d1b..2c68a393d 100644
--- a/streampipes-extensions/streampipes-processors-text-mining-jvm/src/main/java/org/apache/streampipes/processors/textmining/jvm/processor/tokenizer/TokenizerProcessor.java
+++ b/streampipes-extensions/streampipes-processors-text-mining-jvm/src/main/java/org/apache/streampipes/processors/textmining/jvm/processor/tokenizer/TokenizerProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.textmining.jvm.processor.tokenizer;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -31,9 +33,7 @@ import org.apache.streampipes.sdk.helpers.Labels;
 import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import opennlp.tools.tokenize.TokenizerME;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/AbstractFlinkTransformationProgram.java b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/AbstractFlinkTransformationProgram.java
index c98cf9d3d..9f4ce5f4d 100644
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/AbstractFlinkTransformationProgram.java
+++ b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/AbstractFlinkTransformationProgram.java
@@ -17,33 +17,13 @@
  */
 package org.apache.streampipes.processors.transformation.flink;
 
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
-import org.apache.streampipes.processors.transformation.flink.config.ConfigKeys;
-import org.apache.streampipes.svcdiscovery.api.SpConfig;
-import org.apache.streampipes.wrapper.flink.FlinkDataProcessorRuntime;
-import org.apache.streampipes.wrapper.flink.FlinkDeploymentConfig;
-import org.apache.streampipes.wrapper.params.binding.EventProcessorBindingParams;
+import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 
-public abstract class AbstractFlinkTransformationProgram<T extends EventProcessorBindingParams>
-    extends FlinkDataProcessorRuntime<T> {
+public abstract class AbstractFlinkTransformationProgram<T extends ProcessorParams>
+    extends FlinkDataProcessorProgram<T> {
 
-  public AbstractFlinkTransformationProgram(T params,
-                                            ConfigExtractor configExtractor,
-                                            StreamPipesClient streamPipesClient) {
-    super(params, configExtractor, streamPipesClient);
+  public AbstractFlinkTransformationProgram(T params) {
+    super(params);
   }
-
-  @Override
-  protected FlinkDeploymentConfig getDeploymentConfig(ConfigExtractor configExtractor) {
-    SpConfig config = configExtractor.getConfig();
-    return new FlinkDeploymentConfig(config.getString(
-        ConfigKeys.FLINK_JAR_FILE_LOC),
-        config.getString(ConfigKeys.FLINK_HOST),
-        config.getInteger(ConfigKeys.FLINK_PORT),
-        config.getBoolean(ConfigKeys.DEBUG)
-    );
-  }
-
-
 }
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/TransformationFlinkInit.java b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/TransformationFlinkInit.java
index cc7a9ec8e..a16ba92f5 100644
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/TransformationFlinkInit.java
+++ b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/TransformationFlinkInit.java
@@ -30,8 +30,6 @@ import org.apache.streampipes.messaging.mqtt.SpMqttProtocolFactory;
 import org.apache.streampipes.processors.transformation.flink.config.ConfigKeys;
 import org.apache.streampipes.processors.transformation.flink.processor.boilerplate.BoilerplateController;
 import org.apache.streampipes.processors.transformation.flink.processor.converter.FieldConverterController;
-import org.apache.streampipes.processors.transformation.flink.processor.hasher.FieldHasherController;
-import org.apache.streampipes.processors.transformation.flink.processor.mapper.FieldMapperController;
 import org.apache.streampipes.processors.transformation.flink.processor.measurementunitonverter.MeasurementUnitConverterController;
 import org.apache.streampipes.processors.transformation.flink.processor.rename.FieldRenamerController;
 import org.apache.streampipes.service.extensions.ExtensionsModelSubmitter;
@@ -51,8 +49,6 @@ public class TransformationFlinkInit extends ExtensionsModelSubmitter {
             "",
             8090)
         .registerPipelineElements(new FieldConverterController(),
-            new FieldHasherController(),
-            new FieldMapperController(),
             new MeasurementUnitConverterController(),
             new FieldRenamerController(),
             new BoilerplateController())
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/boilerplate/BoilerplateController.java b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/boilerplate/BoilerplateController.java
index ce085b379..67736026a 100644
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/boilerplate/BoilerplateController.java
+++ b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/boilerplate/BoilerplateController.java
@@ -18,8 +18,6 @@
 
 package org.apache.streampipes.processors.transformation.flink.processor.boilerplate;
 
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
 import org.apache.streampipes.model.schema.PropertyScope;
@@ -33,7 +31,7 @@ import org.apache.streampipes.sdk.helpers.Options;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.wrapper.flink.FlinkDataProcessorDeclarer;
-import org.apache.streampipes.wrapper.flink.FlinkDataProcessorRuntime;
+import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
 
 public class BoilerplateController extends FlinkDataProcessorDeclarer<BoilerplateParameters> {
 
@@ -64,10 +62,8 @@ public class BoilerplateController extends FlinkDataProcessorDeclarer<Boilerplat
   }
 
   @Override
-  public FlinkDataProcessorRuntime<BoilerplateParameters> getRuntime(DataProcessorInvocation graph,
-                                                                     ProcessingElementParameterExtractor extractor,
-                                                                     ConfigExtractor configExtractor,
-                                                                     StreamPipesClient streamPipesClient) {
+  public FlinkDataProcessorProgram<BoilerplateParameters> getProgram(DataProcessorInvocation graph,
+                                                                     ProcessingElementParameterExtractor extractor) {
     String htmlProperty = extractor.mappingPropertyValue(HTML_PROPERTY);
     String htmlExtractor = extractor.selectedSingleValue(EXTRACTOR, String.class);
     String htmlOutputMode = extractor.selectedSingleValue(OUTPUT_MODE, String.class);
@@ -104,6 +100,6 @@ public class BoilerplateController extends FlinkDataProcessorDeclarer<Boilerplat
 
     BoilerplateParameters staticParams = new BoilerplateParameters(graph, htmlProperty, extractorMode, outputMode);
 
-    return new BoilerplateProgram(staticParams, configExtractor, streamPipesClient);
+    return new BoilerplateProgram(staticParams);
   }
 }
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/boilerplate/BoilerplateParameters.java b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/boilerplate/BoilerplateParameters.java
index dd7287d50..e88d5db10 100644
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/boilerplate/BoilerplateParameters.java
+++ b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/boilerplate/BoilerplateParameters.java
@@ -19,9 +19,9 @@
 package org.apache.streampipes.processors.transformation.flink.processor.boilerplate;
 
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
-import org.apache.streampipes.wrapper.params.binding.EventProcessorBindingParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 
-public class BoilerplateParameters extends EventProcessorBindingParams {
+public class BoilerplateParameters extends ProcessorParams {
 
   private String htmlProperty;
   private ExtractorMode extractorMode;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/boilerplate/BoilerplateProgram.java b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/boilerplate/BoilerplateProgram.java
index b16bf5cb2..be2f1f196 100644
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/boilerplate/BoilerplateProgram.java
+++ b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/boilerplate/BoilerplateProgram.java
@@ -18,8 +18,6 @@
 
 package org.apache.streampipes.processors.transformation.flink.processor.boilerplate;
 
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
 import org.apache.streampipes.model.runtime.Event;
 import org.apache.streampipes.processors.transformation.flink.AbstractFlinkTransformationProgram;
 
@@ -27,14 +25,12 @@ import org.apache.flink.streaming.api.datastream.DataStream;
 
 public class BoilerplateProgram extends AbstractFlinkTransformationProgram<BoilerplateParameters> {
 
-  public BoilerplateProgram(BoilerplateParameters params,
-                            ConfigExtractor configExtractor,
-                            StreamPipesClient streamPipesClient) {
-    super(params, configExtractor, streamPipesClient);
+  public BoilerplateProgram(BoilerplateParameters params) {
+    super(params);
   }
 
   @Override
-  protected DataStream<Event> getApplicationLogic(DataStream<Event>... dataStreams) {
+  public DataStream<Event> getApplicationLogic(DataStream<Event>... dataStreams) {
     return dataStreams[0].flatMap(
         new BoilerplateRemover(params.getHtmlProperty(), params.getExtractorMode(), params.getOutputMode())
     );
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/converter/FieldConverterController.java b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/converter/FieldConverterController.java
index bf0232582..3929a3650 100644
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/converter/FieldConverterController.java
+++ b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/converter/FieldConverterController.java
@@ -17,12 +17,10 @@
  */
 package org.apache.streampipes.processors.transformation.flink.processor.converter;
 
-import org.apache.streampipes.client.StreamPipesClient;
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
 import org.apache.streampipes.extensions.api.extractor.IStaticPropertyExtractor;
 import org.apache.streampipes.extensions.api.runtime.ResolvesContainerProvidedOptions;
 import org.apache.streampipes.extensions.api.runtime.ResolvesContainerProvidedOutputStrategy;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
 import org.apache.streampipes.model.schema.EventProperty;
@@ -42,7 +40,7 @@ import org.apache.streampipes.sdk.helpers.Tuple2;
 import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.vocabulary.XSD;
 import org.apache.streampipes.wrapper.flink.FlinkDataProcessorDeclarer;
-import org.apache.streampipes.wrapper.flink.FlinkDataProcessorRuntime;
+import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -73,10 +71,8 @@ public class FieldConverterController extends
   }
 
   @Override
-  public FlinkDataProcessorRuntime<FieldConverterParameters> getRuntime(DataProcessorInvocation graph,
-                                                                        ProcessingElementParameterExtractor extractor,
-                                                                        ConfigExtractor configExtractor,
-                                                                        StreamPipesClient streamPipesClient) {
+  public FlinkDataProcessorProgram<FieldConverterParameters> getProgram(DataProcessorInvocation graph,
+                                                                        ProcessingElementParameterExtractor extractor) {
     String convertProperty = extractor.mappingPropertyValue(CONVERT_PROPERTY);
     String targetDatatype = extractor.selectedSingleValueInternalName(TARGET_TYPE, String.class);
 
@@ -86,7 +82,7 @@ public class FieldConverterController extends
         targetDatatype
     );
 
-    return new FieldConverterProgram(staticParams, configExtractor, streamPipesClient);
+    return new FieldConverterProgram(staticParams);
   }
 
   @Override
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/converter/FieldConverterParameters.java b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/converter/FieldConverterParameters.java
index 23281b176..14b174615 100644
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/converter/FieldConverterParameters.java
+++ b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/converter/FieldConverterParameters.java
@@ -18,9 +18,9 @@
 package org.apache.streampipes.processors.transformation.flink.processor.converter;
 
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
-import org.apache.streampipes.wrapper.params.binding.EventProcessorBindingParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 
-public class FieldConverterParameters extends EventProcessorBindingParams {
+public class FieldConverterParameters extends ProcessorParams {
 
   private String convertProperty;
   private String targetDatatype;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/converter/FieldConverterProgram.java b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/converter/FieldConverterProgram.java
index 53ad3fab3..268005af6 100644
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/converter/FieldConverterProgram.java
+++ b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/converter/FieldConverterProgram.java
@@ -17,8 +17,6 @@
  */
 package org.apache.streampipes.processors.transformation.flink.processor.converter;
 
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
 import org.apache.streampipes.model.runtime.Event;
 import org.apache.streampipes.processors.transformation.flink.AbstractFlinkTransformationProgram;
 
@@ -26,14 +24,12 @@ import org.apache.flink.streaming.api.datastream.DataStream;
 
 public class FieldConverterProgram extends AbstractFlinkTransformationProgram<FieldConverterParameters> {
 
-  public FieldConverterProgram(FieldConverterParameters params,
-                               ConfigExtractor configExtractor,
-                               StreamPipesClient streamPipesClient) {
-    super(params, configExtractor, streamPipesClient);
+  public FieldConverterProgram(FieldConverterParameters params) {
+    super(params);
   }
 
   @Override
-  protected DataStream<Event> getApplicationLogic(DataStream<Event>... messageStream) {
+  public DataStream<Event> getApplicationLogic(DataStream<Event>... messageStream) {
     return messageStream[0].flatMap(new FieldConverter(params.getConvertProperty(), params.getTargetDatatype()));
   }
 }
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/hasher/FieldHasher.java b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/hasher/FieldHasher.java
deleted file mode 100644
index 100c2a2b4..000000000
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/hasher/FieldHasher.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.streampipes.processors.transformation.flink.processor.hasher;
-
-import org.apache.streampipes.model.runtime.Event;
-import org.apache.streampipes.processors.transformation.flink.processor.hasher.algorithm.HashAlgorithm;
-
-import org.apache.flink.api.common.functions.FlatMapFunction;
-import org.apache.flink.util.Collector;
-
-import java.io.Serializable;
-
-public class FieldHasher implements Serializable, FlatMapFunction<Event, Event> {
-
-  private HashAlgorithm hashAlgorithm;
-  private String propertyName;
-
-  public FieldHasher(String propertyName, HashAlgorithm hashAlgorithm) {
-    this.propertyName = propertyName;
-    this.hashAlgorithm = hashAlgorithm;
-  }
-
-  @Override
-  public void flatMap(Event in, Collector<Event> out) throws Exception {
-    in.updateFieldBySelector(propertyName,
-        hashAlgorithm.toHashValue(in.getFieldBySelector(propertyName).getAsPrimitive().getAsString()));
-    out.collect(in);
-  }
-
-}
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/hasher/FieldHasherController.java b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/hasher/FieldHasherController.java
deleted file mode 100644
index e311e2854..000000000
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/hasher/FieldHasherController.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.streampipes.processors.transformation.flink.processor.hasher;
-
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
-import org.apache.streampipes.model.graph.DataProcessorDescription;
-import org.apache.streampipes.model.graph.DataProcessorInvocation;
-import org.apache.streampipes.model.schema.PropertyScope;
-import org.apache.streampipes.processors.transformation.flink.processor.hasher.algorithm.HashAlgorithmType;
-import org.apache.streampipes.sdk.builder.ProcessingElementBuilder;
-import org.apache.streampipes.sdk.builder.StreamRequirementsBuilder;
-import org.apache.streampipes.sdk.extractor.ProcessingElementParameterExtractor;
-import org.apache.streampipes.sdk.helpers.EpRequirements;
-import org.apache.streampipes.sdk.helpers.Labels;
-import org.apache.streampipes.sdk.helpers.Locales;
-import org.apache.streampipes.sdk.helpers.Options;
-import org.apache.streampipes.sdk.helpers.OutputStrategies;
-import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.flink.FlinkDataProcessorDeclarer;
-import org.apache.streampipes.wrapper.flink.FlinkDataProcessorRuntime;
-
-public class FieldHasherController extends FlinkDataProcessorDeclarer<FieldHasherParameters> {
-
-  private static final String HASH_PROPERTIES = "property-mapping";
-  private static final String HASH_ALGORITHM = "hash-algorithm";
-
-  @Override
-  public DataProcessorDescription declareModel() {
-    return ProcessingElementBuilder.create("org.apache.streampipes.processors.transformation.flink.fieldhasher")
-        .withLocales(Locales.EN)
-        .withAssets(Assets.DOCUMENTATION, Assets.ICON)
-        .requiredStream(StreamRequirementsBuilder
-            .create()
-            .requiredPropertyWithUnaryMapping(EpRequirements.stringReq(), Labels.withId
-                (HASH_PROPERTIES), PropertyScope.NONE)
-            .build())
-        .requiredSingleValueSelection(Labels.withId(HASH_ALGORITHM),
-            Options.from("SHA1", "SHA2", "MD5"))
-        .outputStrategy(OutputStrategies.keep())
-        .build();
-  }
-
-  @Override
-  public FlinkDataProcessorRuntime<FieldHasherParameters> getRuntime(DataProcessorInvocation graph,
-                                                                     ProcessingElementParameterExtractor extractor,
-                                                                     ConfigExtractor configExtractor,
-                                                                     StreamPipesClient streamPipesClient) {
-    String propertyName = extractor.mappingPropertyValue(HASH_PROPERTIES);
-
-    HashAlgorithmType hashAlgorithmType =
-        HashAlgorithmType.valueOf(extractor.selectedSingleValue(HASH_ALGORITHM, String.class));
-
-    return new FieldHasherProgram(
-        new FieldHasherParameters(graph, propertyName, hashAlgorithmType), configExtractor, streamPipesClient);
-  }
-
-}
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/hasher/FieldHasherParameters.java b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/hasher/FieldHasherParameters.java
deleted file mode 100644
index 6eb31f35a..000000000
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/hasher/FieldHasherParameters.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.streampipes.processors.transformation.flink.processor.hasher;
-
-import org.apache.streampipes.model.graph.DataProcessorInvocation;
-import org.apache.streampipes.processors.transformation.flink.processor.hasher.algorithm.HashAlgorithmType;
-import org.apache.streampipes.wrapper.params.binding.EventProcessorBindingParams;
-
-public class FieldHasherParameters extends EventProcessorBindingParams {
-
-  private String propertyName;
-  private HashAlgorithmType hashAlgorithmType;
-
-  public FieldHasherParameters(DataProcessorInvocation graph, String propertyName,
-                               HashAlgorithmType hashAlgorithmType) {
-    super(graph);
-    this.propertyName = propertyName;
-    this.hashAlgorithmType = hashAlgorithmType;
-  }
-
-  public String getPropertyName() {
-    return propertyName;
-  }
-
-  public HashAlgorithmType getHashAlgorithmType() {
-    return hashAlgorithmType;
-  }
-
-}
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/hasher/FieldHasherProgram.java b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/hasher/FieldHasherProgram.java
deleted file mode 100644
index 1d78ce3d7..000000000
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/hasher/FieldHasherProgram.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.streampipes.processors.transformation.flink.processor.hasher;
-
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
-import org.apache.streampipes.model.runtime.Event;
-import org.apache.streampipes.processors.transformation.flink.AbstractFlinkTransformationProgram;
-
-import org.apache.flink.streaming.api.datastream.DataStream;
-
-import java.io.Serializable;
-
-public class FieldHasherProgram extends AbstractFlinkTransformationProgram<FieldHasherParameters>
-    implements Serializable {
-
-  public FieldHasherProgram(FieldHasherParameters params,
-                            ConfigExtractor configExtractor,
-                            StreamPipesClient streamPipesClient) {
-    super(params, configExtractor, streamPipesClient);
-  }
-
-  @Override
-  protected DataStream<Event> getApplicationLogic(
-      DataStream<Event>... messageStream) {
-    return messageStream[0].flatMap(new FieldHasher(bindingParams.getPropertyName(),
-        bindingParams.getHashAlgorithmType().hashAlgorithm()));
-  }
-
-}
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/hasher/algorithm/HashAlgorithmType.java b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/hasher/algorithm/HashAlgorithmType.java
deleted file mode 100644
index b107666c6..000000000
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/hasher/algorithm/HashAlgorithmType.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.streampipes.processors.transformation.flink.processor.hasher.algorithm;
-
-public enum HashAlgorithmType {
-  MD5(new Md5HashAlgorithm()), SHA1(new Sha1HashAlgorithm()), SHA2(new Sha2HashAlgorithm());
-
-  private HashAlgorithm hashAlgorithm;
-
-  HashAlgorithmType(HashAlgorithm hashAlgorithm) {
-    this.hashAlgorithm = hashAlgorithm;
-  }
-
-  public HashAlgorithm hashAlgorithm() {
-    return hashAlgorithm;
-  }
-}
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/hasher/algorithm/Sha2HashAlgorithm.java b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/hasher/algorithm/Sha2HashAlgorithm.java
deleted file mode 100644
index 67b8ca258..000000000
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/hasher/algorithm/Sha2HashAlgorithm.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.streampipes.processors.transformation.flink.processor.hasher.algorithm;
-
-import org.apache.commons.codec.digest.DigestUtils;
-
-public class Sha2HashAlgorithm implements HashAlgorithm {
-
-  private static final long serialVersionUID = 1L;
-
-  @Override
-  public String toHashValue(Object value) {
-    return DigestUtils.sha256Hex(String.valueOf(value));
-  }
-
-}
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/mapper/FieldMapper.java b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/mapper/FieldMapper.java
deleted file mode 100644
index 7b10e119b..000000000
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/mapper/FieldMapper.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.streampipes.processors.transformation.flink.processor.mapper;
-
-import org.apache.streampipes.model.runtime.Event;
-import org.apache.streampipes.processors.transformation.flink.processor.hasher.algorithm.HashAlgorithmType;
-
-import org.apache.flink.api.common.functions.FlatMapFunction;
-import org.apache.flink.util.Collector;
-
-import java.util.List;
-
-public class FieldMapper implements FlatMapFunction<Event, Event> {
-
-  private List<String> replacePropertyNames;
-  private String newFieldName;
-
-  public FieldMapper(List<String> replacePropertyNames, String newFieldName) {
-    this.replacePropertyNames = replacePropertyNames;
-    this.newFieldName = newFieldName;
-  }
-
-  @Override
-  public void flatMap(Event in, Collector<Event> out) {
-    Event event = new Event();
-    StringBuilder hashValue = new StringBuilder();
-
-    for (String key : in.getFields().keySet()) {
-      if (replacePropertyNames.stream().noneMatch(r -> r.equals(key))) {
-        event.addField(in.getFieldBySelector(key));
-      } else {
-        hashValue.append(in.getFieldBySelector((key)).getAsPrimitive().getAsString());
-      }
-    }
-
-    event.addField(newFieldName, HashAlgorithmType.MD5.hashAlgorithm().toHashValue(hashValue
-        .toString
-            ()));
-    out.collect(event);
-  }
-}
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/mapper/FieldMapperController.java b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/mapper/FieldMapperController.java
deleted file mode 100644
index 32d39dfb7..000000000
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/mapper/FieldMapperController.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.streampipes.processors.transformation.flink.processor.mapper;
-
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.api.runtime.ResolvesContainerProvidedOutputStrategy;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
-import org.apache.streampipes.model.graph.DataProcessorDescription;
-import org.apache.streampipes.model.graph.DataProcessorInvocation;
-import org.apache.streampipes.model.schema.EventProperty;
-import org.apache.streampipes.model.schema.EventPropertyPrimitive;
-import org.apache.streampipes.model.schema.EventSchema;
-import org.apache.streampipes.model.schema.PropertyScope;
-import org.apache.streampipes.sdk.builder.PrimitivePropertyBuilder;
-import org.apache.streampipes.sdk.builder.ProcessingElementBuilder;
-import org.apache.streampipes.sdk.builder.StreamRequirementsBuilder;
-import org.apache.streampipes.sdk.extractor.ProcessingElementParameterExtractor;
-import org.apache.streampipes.sdk.helpers.EpRequirements;
-import org.apache.streampipes.sdk.helpers.Labels;
-import org.apache.streampipes.sdk.helpers.Locales;
-import org.apache.streampipes.sdk.helpers.OutputStrategies;
-import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.sdk.utils.Datatypes;
-import org.apache.streampipes.wrapper.flink.FlinkDataProcessorDeclarer;
-import org.apache.streampipes.wrapper.flink.FlinkDataProcessorRuntime;
-
-import java.util.List;
-
-public class FieldMapperController extends
-    FlinkDataProcessorDeclarer<FieldMapperParameters> implements
-    ResolvesContainerProvidedOutputStrategy<DataProcessorInvocation, ProcessingElementParameterExtractor> {
-
-  private static final String REPLACE_PROPERTIES = "replaceProperties";
-  private static final String FIELD_NAME = "fieldName";
-
-  @Override
-  public DataProcessorDescription declareModel() {
-    return ProcessingElementBuilder.create("org.apache.streampipes.processors.transformation.flink.field-mapper")
-        .withLocales(Locales.EN)
-        .withAssets(Assets.DOCUMENTATION, Assets.ICON)
-        .requiredStream(StreamRequirementsBuilder
-            .create()
-            .requiredPropertyWithNaryMapping(EpRequirements.anyProperty(), Labels.withId
-                (REPLACE_PROPERTIES), PropertyScope.NONE)
-            .build())
-        .requiredTextParameter(Labels.withId(FIELD_NAME))
-        .outputStrategy(OutputStrategies.customTransformation())
-        .build();
-  }
-
-  @Override
-  public FlinkDataProcessorRuntime<FieldMapperParameters> getRuntime(DataProcessorInvocation graph,
-                                                                     ProcessingElementParameterExtractor extractor,
-                                                                     ConfigExtractor configExtractor,
-                                                                     StreamPipesClient streamPipesClient) {
-
-    List<String> replacePropertyNames = extractor.mappingPropertyValues(REPLACE_PROPERTIES);
-    String newFieldName = extractor.singleValueParameter(FIELD_NAME, String.class);
-    FieldMapperParameters params = new FieldMapperParameters(graph, replacePropertyNames, newFieldName);
-
-
-    return new FieldMapperProgram(params, configExtractor, streamPipesClient);
-  }
-
-  @Override
-  public EventSchema resolveOutputStrategy(DataProcessorInvocation processingElement,
-                                           ProcessingElementParameterExtractor extractor) {
-
-    List<String> replacePropertyNames = extractor.mappingPropertyValues(REPLACE_PROPERTIES);
-    String newFieldName = extractor.singleValueParameter(FIELD_NAME, String.class);
-
-    List<EventProperty> outProperties = extractor.getNoneInputStreamEventPropertySubset(replacePropertyNames);
-
-    EventPropertyPrimitive newProperty = PrimitivePropertyBuilder.create(Datatypes.String, newFieldName).build();
-    outProperties.add(newProperty);
-    return new EventSchema(outProperties);
-  }
-}
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/mapper/FieldMapperParameters.java b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/mapper/FieldMapperParameters.java
deleted file mode 100644
index 5c0cbd8d4..000000000
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/mapper/FieldMapperParameters.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.streampipes.processors.transformation.flink.processor.mapper;
-
-import org.apache.streampipes.model.graph.DataProcessorInvocation;
-import org.apache.streampipes.wrapper.params.binding.EventProcessorBindingParams;
-
-import java.util.List;
-
-public class FieldMapperParameters extends EventProcessorBindingParams {
-
-  private List<String> replacePropertyNames;
-  private String newFieldName;
-
-  public FieldMapperParameters(DataProcessorInvocation graph, List<String> replacePropertyNames, String newFieldName) {
-    super(graph);
-    this.replacePropertyNames = replacePropertyNames;
-    this.newFieldName = newFieldName;
-  }
-
-  public List<String> getReplacePropertyNames() {
-    return replacePropertyNames;
-  }
-
-  public String getNewFieldName() {
-    return newFieldName;
-  }
-}
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/mapper/FieldMapperProgram.java b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/mapper/FieldMapperProgram.java
deleted file mode 100644
index ede1e23c1..000000000
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/mapper/FieldMapperProgram.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.streampipes.processors.transformation.flink.processor.mapper;
-
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
-import org.apache.streampipes.model.runtime.Event;
-import org.apache.streampipes.processors.transformation.flink.AbstractFlinkTransformationProgram;
-
-import org.apache.flink.streaming.api.datastream.DataStream;
-
-public class FieldMapperProgram extends AbstractFlinkTransformationProgram<FieldMapperParameters> {
-
-  public FieldMapperProgram(FieldMapperParameters params,
-                            ConfigExtractor configExtractor,
-                            StreamPipesClient streamPipesClient) {
-    super(params, configExtractor, streamPipesClient);
-  }
-
-  @Override
-  protected DataStream<Event> getApplicationLogic(DataStream<Event>...
-                                                      messageStream) {
-    return messageStream[0].flatMap(new FieldMapper(params.getReplacePropertyNames(), params.getNewFieldName()));
-  }
-}
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/measurementunitonverter/MeasurementUnitConverterController.java b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/measurementunitonverter/MeasurementUnitConverterController.java
index c422d1c98..6999c832a 100644
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/measurementunitonverter/MeasurementUnitConverterController.java
+++ b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/measurementunitonverter/MeasurementUnitConverterController.java
@@ -18,11 +18,9 @@
 
 package org.apache.streampipes.processors.transformation.flink.processor.measurementunitonverter;
 
-import org.apache.streampipes.client.StreamPipesClient;
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
 import org.apache.streampipes.extensions.api.extractor.IStaticPropertyExtractor;
 import org.apache.streampipes.extensions.api.runtime.ResolvesContainerProvidedOptions;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
 import org.apache.streampipes.model.schema.EventProperty;
@@ -41,7 +39,7 @@ import org.apache.streampipes.sdk.helpers.TransformOperations;
 import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.units.UnitProvider;
 import org.apache.streampipes.wrapper.flink.FlinkDataProcessorDeclarer;
-import org.apache.streampipes.wrapper.flink.FlinkDataProcessorRuntime;
+import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
 
 import com.github.jqudt.Unit;
 
@@ -79,11 +77,9 @@ public class MeasurementUnitConverterController extends
 
 
   @Override
-  public FlinkDataProcessorRuntime<MeasurementUnitConverterParameters> getRuntime(
+  public FlinkDataProcessorProgram<MeasurementUnitConverterParameters> getProgram(
       DataProcessorInvocation sepa,
-      ProcessingElementParameterExtractor extractor,
-      ConfigExtractor configExtractor,
-      StreamPipesClient streamPipesClient) {
+      ProcessingElementParameterExtractor extractor) {
 
     String convertProperty = extractor.mappingPropertyValue(CONVERT_PROPERTY);
     String inputUnitId = extractor.measurementUnit(convertProperty, 0);
@@ -103,7 +99,7 @@ public class MeasurementUnitConverterController extends
         outputUnit
     );
 
-    return new MeasurementUnitConverterProgram(staticParams, configExtractor, streamPipesClient);
+    return new MeasurementUnitConverterProgram(staticParams);
   }
 
   @Override
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/measurementunitonverter/MeasurementUnitConverterParameters.java b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/measurementunitonverter/MeasurementUnitConverterParameters.java
index 96038d746..98a36ffd0 100644
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/measurementunitonverter/MeasurementUnitConverterParameters.java
+++ b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/measurementunitonverter/MeasurementUnitConverterParameters.java
@@ -19,11 +19,11 @@
 package org.apache.streampipes.processors.transformation.flink.processor.measurementunitonverter;
 
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
-import org.apache.streampipes.wrapper.params.binding.EventProcessorBindingParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 
 import com.github.jqudt.Unit;
 
-public class MeasurementUnitConverterParameters extends EventProcessorBindingParams {
+public class MeasurementUnitConverterParameters extends ProcessorParams {
 
   private String convertProperty;
   private Unit inputUnit;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/measurementunitonverter/MeasurementUnitConverterProgram.java b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/measurementunitonverter/MeasurementUnitConverterProgram.java
index b7048c50c..2f6ec1b2d 100644
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/measurementunitonverter/MeasurementUnitConverterProgram.java
+++ b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/measurementunitonverter/MeasurementUnitConverterProgram.java
@@ -18,8 +18,6 @@
 
 package org.apache.streampipes.processors.transformation.flink.processor.measurementunitonverter;
 
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
 import org.apache.streampipes.model.runtime.Event;
 import org.apache.streampipes.processors.transformation.flink.AbstractFlinkTransformationProgram;
 
@@ -28,14 +26,12 @@ import org.apache.flink.streaming.api.datastream.DataStream;
 public class MeasurementUnitConverterProgram
     extends AbstractFlinkTransformationProgram<MeasurementUnitConverterParameters> {
 
-  public MeasurementUnitConverterProgram(MeasurementUnitConverterParameters params,
-                                         ConfigExtractor configExtractor,
-                                         StreamPipesClient streamPipesClient) {
-    super(params, configExtractor, streamPipesClient);
+  public MeasurementUnitConverterProgram(MeasurementUnitConverterParameters params) {
+    super(params);
   }
 
   @Override
-  protected DataStream<Event> getApplicationLogic(DataStream<Event>...
+  public DataStream<Event> getApplicationLogic(DataStream<Event>...
                                                       dataStreams) {
     return dataStreams[0].flatMap(new MeasurementUnitConverter(params.getInputUnit()
         .getResource().toString(), params.getOutputUnit().getResource().toString(),
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/rename/FieldRenamerController.java b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/rename/FieldRenamerController.java
index a3d1484f9..9f33c4f00 100644
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/rename/FieldRenamerController.java
+++ b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/rename/FieldRenamerController.java
@@ -18,8 +18,6 @@
 
 package org.apache.streampipes.processors.transformation.flink.processor.rename;
 
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
@@ -34,7 +32,7 @@ import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.helpers.TransformOperations;
 import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.wrapper.flink.FlinkDataProcessorDeclarer;
-import org.apache.streampipes.wrapper.flink.FlinkDataProcessorRuntime;
+import org.apache.streampipes.wrapper.flink.FlinkDataProcessorProgram;
 
 public class FieldRenamerController extends FlinkDataProcessorDeclarer<FieldRenamerParameters> {
 
@@ -59,15 +57,13 @@ public class FieldRenamerController extends FlinkDataProcessorDeclarer<FieldRena
   }
 
   @Override
-  public FlinkDataProcessorRuntime<FieldRenamerParameters> getRuntime(DataProcessorInvocation graph,
-                                                                      ProcessingElementParameterExtractor extractor,
-                                                                      ConfigExtractor configExtractor,
-                                                                      StreamPipesClient streamPipesClient) {
+  public FlinkDataProcessorProgram<FieldRenamerParameters> getProgram(DataProcessorInvocation graph,
+                                                                      ProcessingElementParameterExtractor extractor) {
     String oldPropertyName = extractor.mappingPropertyValue(CONVERT_PROPERTY);
     String newPropertyName = extractor.singleValueParameter(FIELD_NAME, String.class);
 
     return new FieldRenamerProgram(
-        new FieldRenamerParameters(graph, oldPropertyName, newPropertyName), configExtractor, streamPipesClient);
+        new FieldRenamerParameters(graph, oldPropertyName, newPropertyName));
   }
 
 }
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/rename/FieldRenamerParameters.java b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/rename/FieldRenamerParameters.java
index c0b2f17e1..d4ec843e5 100644
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/rename/FieldRenamerParameters.java
+++ b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/rename/FieldRenamerParameters.java
@@ -19,9 +19,9 @@
 package org.apache.streampipes.processors.transformation.flink.processor.rename;
 
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
-import org.apache.streampipes.wrapper.params.binding.EventProcessorBindingParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 
-public class FieldRenamerParameters extends EventProcessorBindingParams {
+public class FieldRenamerParameters extends ProcessorParams {
 
   private String oldPropertyName;
   private String newPropertyName;
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/rename/FieldRenamerProgram.java b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/rename/FieldRenamerProgram.java
index 99784c437..7315bfab6 100644
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/rename/FieldRenamerProgram.java
+++ b/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/rename/FieldRenamerProgram.java
@@ -18,8 +18,6 @@
 
 package org.apache.streampipes.processors.transformation.flink.processor.rename;
 
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
 import org.apache.streampipes.model.runtime.Event;
 import org.apache.streampipes.processors.transformation.flink.AbstractFlinkTransformationProgram;
 
@@ -27,14 +25,12 @@ import org.apache.flink.streaming.api.datastream.DataStream;
 
 public class FieldRenamerProgram extends AbstractFlinkTransformationProgram<FieldRenamerParameters> {
 
-  public FieldRenamerProgram(FieldRenamerParameters params,
-                             ConfigExtractor configExtractor,
-                             StreamPipesClient streamPipesClient) {
-    super(params, configExtractor, streamPipesClient);
+  public FieldRenamerProgram(FieldRenamerParameters params) {
+    super(params);
   }
 
   @Override
-  protected DataStream<Event> getApplicationLogic(
+  public DataStream<Event> getApplicationLogic(
       DataStream<Event>... messageStream) {
     return messageStream[0].flatMap(new FieldRenamer(params.getOldPropertyName(),
         params.getNewPropertyName()));
diff --git a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/array/count/CountArrayProcessor.java b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/array/count/CountArrayProcessor.java
index 62b2818d4..c22a9a65b 100644
--- a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/array/count/CountArrayProcessor.java
+++ b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/array/count/CountArrayProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.transformation.jvm.processor.array.count;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -33,9 +35,7 @@ import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.vocabulary.SO;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import java.util.List;
diff --git a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/array/split/SplitArrayProcessor.java b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/array/split/SplitArrayProcessor.java
index 6d0028de1..ded7815fe 100644
--- a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/array/split/SplitArrayProcessor.java
+++ b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/array/split/SplitArrayProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.transformation.jvm.processor.array.split;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.extensions.api.runtime.ResolvesContainerProvidedOutputStrategy;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
@@ -39,9 +41,7 @@ import org.apache.streampipes.sdk.helpers.Labels;
 import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import java.util.ArrayList;
diff --git a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/booloperator/counter/BooleanCounterProcessor.java b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/booloperator/counter/BooleanCounterProcessor.java
index 5de906643..599425725 100644
--- a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/booloperator/counter/BooleanCounterProcessor.java
+++ b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/booloperator/counter/BooleanCounterProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.transformation.jvm.processor.booloperator.counter;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.logging.api.Logger;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
@@ -34,9 +36,7 @@ import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.Options;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 public class BooleanCounterProcessor extends StreamPipesDataProcessor {
@@ -137,4 +137,4 @@ public class BooleanCounterProcessor extends StreamPipesDataProcessor {
   @Override
   public void onDetach() {
   }
-}
\ No newline at end of file
+}
diff --git a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/booloperator/edge/SignalEdgeFilterProcessor.java b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/booloperator/edge/SignalEdgeFilterProcessor.java
index 3df28ad08..84f76243b 100644
--- a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/booloperator/edge/SignalEdgeFilterProcessor.java
+++ b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/booloperator/edge/SignalEdgeFilterProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.transformation.jvm.processor.booloperator.edge;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -31,9 +33,7 @@ import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.Options;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import java.util.ArrayList;
diff --git a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/booloperator/inverter/BooleanInverterProcessor.java b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/booloperator/inverter/BooleanInverterProcessor.java
index 7c75ed72b..17f938f5a 100644
--- a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/booloperator/inverter/BooleanInverterProcessor.java
+++ b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/booloperator/inverter/BooleanInverterProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.transformation.jvm.processor.booloperator.inverter;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.logging.api.Logger;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
@@ -32,9 +34,7 @@ import org.apache.streampipes.sdk.helpers.Labels;
 import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 public class BooleanInverterProcessor extends StreamPipesDataProcessor {
@@ -77,4 +77,4 @@ public class BooleanInverterProcessor extends StreamPipesDataProcessor {
   public void onDetach() throws SpRuntimeException {
 
   }
-}
\ No newline at end of file
+}
diff --git a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/booloperator/logical/BooleanOperatorProcessor.java b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/booloperator/logical/BooleanOperatorProcessor.java
index 1ce8d2e4a..1acde63e3 100644
--- a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/booloperator/logical/BooleanOperatorProcessor.java
+++ b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/booloperator/logical/BooleanOperatorProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.transformation.jvm.processor.booloperator.logical;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -36,9 +38,7 @@ import org.apache.streampipes.sdk.helpers.Options;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.sdk.utils.Datatypes;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import java.util.List;
diff --git a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/booloperator/state/BooleanToStateProcessor.java b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/booloperator/state/BooleanToStateProcessor.java
index 8d627ff64..71844d0b3 100644
--- a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/booloperator/state/BooleanToStateProcessor.java
+++ b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/booloperator/state/BooleanToStateProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.transformation.jvm.processor.booloperator.state;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -34,9 +36,7 @@ import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.serializers.json.JacksonSerializer;
 import org.apache.streampipes.vocabulary.SPSensor;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
diff --git a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/booloperator/timekeeping/BooleanTimekeepingProcessor.java b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/booloperator/timekeeping/BooleanTimekeepingProcessor.java
index 2e980d80d..ac11a0d16 100644
--- a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/booloperator/timekeeping/BooleanTimekeepingProcessor.java
+++ b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/booloperator/timekeeping/BooleanTimekeepingProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.transformation.jvm.processor.booloperator.timekeeping;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -32,9 +34,7 @@ import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.Options;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import java.util.LinkedList;
diff --git a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/booloperator/timer/BooleanTimerProcessor.java b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/booloperator/timer/BooleanTimerProcessor.java
index 206b545c7..f1fe96716 100644
--- a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/booloperator/timer/BooleanTimerProcessor.java
+++ b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/booloperator/timer/BooleanTimerProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.transformation.jvm.processor.booloperator.timer;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -32,9 +34,7 @@ import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.Options;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 public class BooleanTimerProcessor extends StreamPipesDataProcessor {
diff --git a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/csvmetadata/CsvMetadataEnrichmentProcessor.java b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/csvmetadata/CsvMetadataEnrichmentProcessor.java
index 2a96e0913..20372678e 100644
--- a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/csvmetadata/CsvMetadataEnrichmentProcessor.java
+++ b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/csvmetadata/CsvMetadataEnrichmentProcessor.java
@@ -27,6 +27,8 @@ import org.apache.streampipes.commons.parser.PrimitiveTypeParser;
 import org.apache.streampipes.commons.parser.StringParser;
 import org.apache.streampipes.extensions.api.extractor.IParameterExtractor;
 import org.apache.streampipes.extensions.api.extractor.IStaticPropertyExtractor;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.extensions.api.runtime.ResolvesContainerProvidedOptions;
 import org.apache.streampipes.extensions.api.runtime.ResolvesContainerProvidedOutputStrategy;
 import org.apache.streampipes.extensions.management.client.StreamPipesClientResolver;
@@ -49,9 +51,7 @@ import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.helpers.Tuple2;
 import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.sdk.utils.Datatypes;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import org.apache.commons.csv.CSVParser;
diff --git a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/fieldrename/FiledRenameProcessor.java b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/fieldrename/FiledRenameProcessor.java
index 8528bbdc0..8096b690d 100644
--- a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/fieldrename/FiledRenameProcessor.java
+++ b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/fieldrename/FiledRenameProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.transformation.jvm.processor.fieldrename;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -32,9 +34,7 @@ import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.helpers.TransformOperations;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 public class FiledRenameProcessor extends StreamPipesDataProcessor {
diff --git a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/hasher/FieldHasherProcessor.java b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/hasher/FieldHasherProcessor.java
index 3a43c583e..194111306 100644
--- a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/hasher/FieldHasherProcessor.java
+++ b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/hasher/FieldHasherProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.transformation.jvm.processor.hasher;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
 import org.apache.streampipes.model.schema.PropertyScope;
@@ -32,9 +34,7 @@ import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.Options;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 public class FieldHasherProcessor extends StreamPipesDataProcessor {
diff --git a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/mapper/FieldMapperProcessor.java b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/mapper/FieldMapperProcessor.java
index f13b7f986..345b943bf 100644
--- a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/mapper/FieldMapperProcessor.java
+++ b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/mapper/FieldMapperProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.transformation.jvm.processor.mapper;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.extensions.api.runtime.ResolvesContainerProvidedOutputStrategy;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
@@ -38,9 +40,7 @@ import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.sdk.utils.Datatypes;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import java.util.List;
diff --git a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/measurementconverter/MeasurementUnitConverterProcessor.java b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/measurementconverter/MeasurementUnitConverterProcessor.java
index 9a665dc2c..d7f84f4bd 100644
--- a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/measurementconverter/MeasurementUnitConverterProcessor.java
+++ b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/measurementconverter/MeasurementUnitConverterProcessor.java
@@ -21,6 +21,8 @@ package org.apache.streampipes.processors.transformation.jvm.processor.measureme
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
 import org.apache.streampipes.extensions.api.extractor.IStaticPropertyExtractor;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.extensions.api.runtime.ResolvesContainerProvidedOptions;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -38,9 +40,7 @@ import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.helpers.TransformOperations;
 import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.units.UnitProvider;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import com.github.jqudt.Quantity;
diff --git a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/state/buffer/StateBufferProcessor.java b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/state/buffer/StateBufferProcessor.java
index 77ad0ddfb..ce55c0f48 100644
--- a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/state/buffer/StateBufferProcessor.java
+++ b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/state/buffer/StateBufferProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.transformation.jvm.processor.state.buffer;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
 import org.apache.streampipes.model.schema.PropertyScope;
@@ -32,9 +34,7 @@ import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.vocabulary.SO;
 import org.apache.streampipes.vocabulary.SPSensor;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import java.util.ArrayList;
diff --git a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/state/labeler/buffer/StateBufferLabelerProcessor.java b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/state/labeler/buffer/StateBufferLabelerProcessor.java
index adf903d28..b506c13de 100644
--- a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/state/labeler/buffer/StateBufferLabelerProcessor.java
+++ b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/state/labeler/buffer/StateBufferLabelerProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.transformation.jvm.processor.state.labeler.buffer;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.extensions.api.runtime.ResolvesContainerProvidedOutputStrategy;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
@@ -41,9 +43,7 @@ import org.apache.streampipes.sdk.helpers.Options;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.vocabulary.SPSensor;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import com.google.common.math.Stats;
diff --git a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/state/labeler/number/NumberLabelerProcessor.java b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/state/labeler/number/NumberLabelerProcessor.java
index 5604e7fca..269bac94f 100644
--- a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/state/labeler/number/NumberLabelerProcessor.java
+++ b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/state/labeler/number/NumberLabelerProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.transformation.jvm.processor.state.labeler.number;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.extensions.api.runtime.ResolvesContainerProvidedOutputStrategy;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
@@ -39,9 +41,7 @@ import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.Options;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import java.util.List;
diff --git a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/stringoperator/counter/StringCounterProcessor.java b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/stringoperator/counter/StringCounterProcessor.java
index c8bb27c14..27e7220b5 100644
--- a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/stringoperator/counter/StringCounterProcessor.java
+++ b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/stringoperator/counter/StringCounterProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.transformation.jvm.processor.stringoperator.counter;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.logging.api.Logger;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
@@ -33,9 +35,7 @@ import org.apache.streampipes.sdk.helpers.Labels;
 import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import java.util.HashMap;
diff --git a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/stringoperator/state/StringToStateProcessor.java b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/stringoperator/state/StringToStateProcessor.java
index 39174b553..3dfd95dea 100644
--- a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/stringoperator/state/StringToStateProcessor.java
+++ b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/stringoperator/state/StringToStateProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.transformation.jvm.processor.stringoperator.state;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.logging.api.Logger;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
@@ -34,9 +36,7 @@ import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.vocabulary.SPSensor;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import com.google.common.collect.Lists;
diff --git a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/stringoperator/timer/StringTimerProcessor.java b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/stringoperator/timer/StringTimerProcessor.java
index 32fb42bbf..65de862a0 100644
--- a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/stringoperator/timer/StringTimerProcessor.java
+++ b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/stringoperator/timer/StringTimerProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.transformation.jvm.processor.stringoperator.timer;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.logging.api.Logger;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
@@ -34,9 +36,7 @@ import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.Options;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import java.util.Objects;
diff --git a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/task/TaskDurationProcessor.java b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/task/TaskDurationProcessor.java
index 2e27876dd..e90ffe049 100644
--- a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/task/TaskDurationProcessor.java
+++ b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/task/TaskDurationProcessor.java
@@ -18,6 +18,8 @@
 package org.apache.streampipes.processors.transformation.jvm.processor.task;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -31,9 +33,7 @@ import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.Options;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 public class TaskDurationProcessor extends StreamPipesDataProcessor {
diff --git a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/timestampextractor/TimestampExtractorProcessor.java b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/timestampextractor/TimestampExtractorProcessor.java
index 173e8888b..c41224e84 100644
--- a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/timestampextractor/TimestampExtractorProcessor.java
+++ b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/timestampextractor/TimestampExtractorProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.transformation.jvm.processor.timestampextractor;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.extensions.api.runtime.ResolvesContainerProvidedOutputStrategy;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
@@ -37,9 +39,7 @@ import org.apache.streampipes.sdk.helpers.Options;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.vocabulary.SO;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import java.util.Calendar;
diff --git a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/transformtoboolean/TransformToBooleanProcessor.java b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/transformtoboolean/TransformToBooleanProcessor.java
index 4ca6c1389..c4014a983 100644
--- a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/transformtoboolean/TransformToBooleanProcessor.java
+++ b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/transformtoboolean/TransformToBooleanProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.transformation.jvm.processor.transformtoboolean;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.extensions.api.runtime.ResolvesContainerProvidedOutputStrategy;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
@@ -38,9 +40,7 @@ import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.sdk.utils.Datatypes;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 import org.slf4j.Logger;
diff --git a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/value/change/ChangedValueDetectionProcessor.java b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/value/change/ChangedValueDetectionProcessor.java
index 56a672042..591b557cd 100644
--- a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/value/change/ChangedValueDetectionProcessor.java
+++ b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/value/change/ChangedValueDetectionProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.transformation.jvm.processor.value.change;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -31,9 +33,7 @@ import org.apache.streampipes.sdk.helpers.Labels;
 import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 public class ChangedValueDetectionProcessor
diff --git a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/value/duration/CalculateDurationProcessor.java b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/value/duration/CalculateDurationProcessor.java
index 71176b14c..e243a6cca 100644
--- a/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/value/duration/CalculateDurationProcessor.java
+++ b/streampipes-extensions/streampipes-processors-transformation-jvm/src/main/java/org/apache/streampipes/processors/transformation/jvm/processor/value/duration/CalculateDurationProcessor.java
@@ -19,6 +19,8 @@
 package org.apache.streampipes.processors.transformation.jvm.processor.value.duration;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.model.DataProcessorType;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -33,9 +35,7 @@ import org.apache.streampipes.sdk.helpers.Options;
 import org.apache.streampipes.sdk.helpers.OutputStrategies;
 import org.apache.streampipes.sdk.utils.Assets;
 import org.apache.streampipes.vocabulary.SO;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataProcessor;
 
 public class CalculateDurationProcessor extends StreamPipesDataProcessor {
diff --git a/streampipes-extensions/streampipes-processors-transformation-jvm/src/test/java/org/apache/streampipes/processors/transformation/jvm/processor/booloperator/counter/TestBooleanCounterProcessor.java b/streampipes-extensions/streampipes-processors-transformation-jvm/src/test/java/org/apache/streampipes/processors/transformation/jvm/processor/booloperator/counter/TestBooleanCounterProcessor.java
index a97da99ca..015fc0d55 100644
--- a/streampipes-extensions/streampipes-processors-transformation-jvm/src/test/java/org/apache/streampipes/processors/transformation/jvm/processor/booloperator/counter/TestBooleanCounterProcessor.java
+++ b/streampipes-extensions/streampipes-processors-transformation-jvm/src/test/java/org/apache/streampipes/processors/transformation/jvm/processor/booloperator/counter/TestBooleanCounterProcessor.java
@@ -19,6 +19,7 @@
 package org.apache.streampipes.processors.transformation.jvm.processor.booloperator.counter;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.messaging.InternalEventProcessor;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
@@ -31,8 +32,7 @@ import org.apache.streampipes.model.staticproperty.OneOfStaticProperty;
 import org.apache.streampipes.test.generator.EventStreamGenerator;
 import org.apache.streampipes.test.generator.InvocationGraphGenerator;
 import org.apache.streampipes.test.generator.grounding.EventGroundingGenerator;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -174,4 +174,4 @@ public class TestBooleanCounterProcessor {
             new SourceInfo("test" + "-topic", "s0"),
             new SchemaInfo(null, new ArrayList<>()));
   }
-}
\ No newline at end of file
+}
diff --git a/streampipes-extensions/streampipes-processors-transformation-jvm/src/test/java/org/apache/streampipes/processors/transformation/jvm/processor/booloperator/inverter/TestBooleanInverterProcessor.java b/streampipes-extensions/streampipes-processors-transformation-jvm/src/test/java/org/apache/streampipes/processors/transformation/jvm/processor/booloperator/inverter/TestBooleanInverterProcessor.java
index e753903a8..775f3cb02 100644
--- a/streampipes-extensions/streampipes-processors-transformation-jvm/src/test/java/org/apache/streampipes/processors/transformation/jvm/processor/booloperator/inverter/TestBooleanInverterProcessor.java
+++ b/streampipes-extensions/streampipes-processors-transformation-jvm/src/test/java/org/apache/streampipes/processors/transformation/jvm/processor/booloperator/inverter/TestBooleanInverterProcessor.java
@@ -19,6 +19,7 @@
 package org.apache.streampipes.processors.transformation.jvm.processor.booloperator.inverter;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.messaging.InternalEventProcessor;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
@@ -30,8 +31,7 @@ import org.apache.streampipes.model.staticproperty.MappingPropertyUnary;
 import org.apache.streampipes.test.generator.EventStreamGenerator;
 import org.apache.streampipes.test.generator.InvocationGraphGenerator;
 import org.apache.streampipes.test.generator.grounding.EventGroundingGenerator;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -156,4 +156,4 @@ public class TestBooleanInverterProcessor {
     return EventFactory.fromMap(map, new SourceInfo("test" + "-topic", "s0"),
             new SchemaInfo(null, new ArrayList<>()));
   }
-}
\ No newline at end of file
+}
diff --git a/streampipes-extensions/streampipes-processors-transformation-jvm/src/test/java/org/apache/streampipes/processors/transformation/jvm/processor/stringoperator/counter/TestStringCounterProcessor.java b/streampipes-extensions/streampipes-processors-transformation-jvm/src/test/java/org/apache/streampipes/processors/transformation/jvm/processor/stringoperator/counter/TestStringCounterProcessor.java
index 3835c0ae8..4c2af3f99 100644
--- a/streampipes-extensions/streampipes-processors-transformation-jvm/src/test/java/org/apache/streampipes/processors/transformation/jvm/processor/stringoperator/counter/TestStringCounterProcessor.java
+++ b/streampipes-extensions/streampipes-processors-transformation-jvm/src/test/java/org/apache/streampipes/processors/transformation/jvm/processor/stringoperator/counter/TestStringCounterProcessor.java
@@ -19,6 +19,7 @@
 package org.apache.streampipes.processors.transformation.jvm.processor.stringoperator.counter;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.messaging.InternalEventProcessor;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
@@ -31,8 +32,7 @@ import org.apache.streampipes.sdk.helpers.Tuple3;
 import org.apache.streampipes.test.generator.EventStreamGenerator;
 import org.apache.streampipes.test.generator.InvocationGraphGenerator;
 import org.apache.streampipes.test.generator.grounding.EventGroundingGenerator;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -179,4 +179,4 @@ public class TestStringCounterProcessor {
         new SourceInfo("test" + "-topic", "s0"),
         new SchemaInfo(null, Lists.newArrayList()));
   }
-}
\ No newline at end of file
+}
diff --git a/streampipes-extensions/streampipes-processors-transformation-jvm/src/test/java/org/apache/streampipes/processors/transformation/jvm/processor/stringoperator/state/TestStringToStateProcessor.java b/streampipes-extensions/streampipes-processors-transformation-jvm/src/test/java/org/apache/streampipes/processors/transformation/jvm/processor/stringoperator/state/TestStringToStateProcessor.java
index 7b4ebfadf..a991a740d 100644
--- a/streampipes-extensions/streampipes-processors-transformation-jvm/src/test/java/org/apache/streampipes/processors/transformation/jvm/processor/stringoperator/state/TestStringToStateProcessor.java
+++ b/streampipes-extensions/streampipes-processors-transformation-jvm/src/test/java/org/apache/streampipes/processors/transformation/jvm/processor/stringoperator/state/TestStringToStateProcessor.java
@@ -19,6 +19,7 @@
 package org.apache.streampipes.processors.transformation.jvm.processor.stringoperator.state;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.messaging.InternalEventProcessor;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
@@ -30,8 +31,7 @@ import org.apache.streampipes.model.staticproperty.MappingPropertyNary;
 import org.apache.streampipes.test.generator.EventStreamGenerator;
 import org.apache.streampipes.test.generator.InvocationGraphGenerator;
 import org.apache.streampipes.test.generator.grounding.EventGroundingGenerator;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
diff --git a/streampipes-extensions/streampipes-processors-transformation-jvm/src/test/java/org/apache/streampipes/processors/transformation/jvm/processor/stringoperator/timer/TestStringTimerProcessor.java b/streampipes-extensions/streampipes-processors-transformation-jvm/src/test/java/org/apache/streampipes/processors/transformation/jvm/processor/stringoperator/timer/TestStringTimerProcessor.java
index 7127e2c57..d38ffa9c3 100644
--- a/streampipes-extensions/streampipes-processors-transformation-jvm/src/test/java/org/apache/streampipes/processors/transformation/jvm/processor/stringoperator/timer/TestStringTimerProcessor.java
+++ b/streampipes-extensions/streampipes-processors-transformation-jvm/src/test/java/org/apache/streampipes/processors/transformation/jvm/processor/stringoperator/timer/TestStringTimerProcessor.java
@@ -19,6 +19,7 @@
 package org.apache.streampipes.processors.transformation.jvm.processor.stringoperator.timer;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
 import org.apache.streampipes.messaging.InternalEventProcessor;
 import org.apache.streampipes.model.graph.DataProcessorDescription;
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
@@ -33,8 +34,7 @@ import org.apache.streampipes.sdk.helpers.Tuple2;
 import org.apache.streampipes.test.generator.EventStreamGenerator;
 import org.apache.streampipes.test.generator.InvocationGraphGenerator;
 import org.apache.streampipes.test.generator.grounding.EventGroundingGenerator;
-import org.apache.streampipes.wrapper.routing.SpOutputCollector;
-import org.apache.streampipes.wrapper.standalone.ProcessorParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
diff --git a/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/bufferrest/BufferRestPublisherSink.java b/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/bufferrest/BufferRestPublisherSink.java
index 7ae978afc..24d1267b2 100644
--- a/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/bufferrest/BufferRestPublisherSink.java
+++ b/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/bufferrest/BufferRestPublisherSink.java
@@ -21,6 +21,7 @@ package org.apache.streampipes.sinks.brokers.jvm.bufferrest;
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
 import org.apache.streampipes.dataformat.SpDataFormatDefinition;
 import org.apache.streampipes.dataformat.json.JsonDataFormatDefinition;
+import org.apache.streampipes.extensions.api.pe.context.EventSinkRuntimeContext;
 import org.apache.streampipes.model.DataSinkType;
 import org.apache.streampipes.model.graph.DataSinkDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -32,8 +33,7 @@ import org.apache.streampipes.sdk.helpers.Labels;
 import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sinks.brokers.jvm.bufferrest.buffer.BufferListener;
 import org.apache.streampipes.sinks.brokers.jvm.bufferrest.buffer.MessageBuffer;
-import org.apache.streampipes.wrapper.context.EventSinkRuntimeContext;
-import org.apache.streampipes.wrapper.standalone.SinkParams;
+import org.apache.streampipes.wrapper.params.compat.SinkParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataSink;
 
 import org.apache.commons.io.Charsets;
diff --git a/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/jms/JmsPublisherSink.java b/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/jms/JmsPublisherSink.java
index 0342cd6be..a1e0dd649 100644
--- a/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/jms/JmsPublisherSink.java
+++ b/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/jms/JmsPublisherSink.java
@@ -21,6 +21,7 @@ package org.apache.streampipes.sinks.brokers.jvm.jms;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
 import org.apache.streampipes.dataformat.json.JsonDataFormatDefinition;
+import org.apache.streampipes.extensions.api.pe.context.EventSinkRuntimeContext;
 import org.apache.streampipes.messaging.jms.ActiveMQPublisher;
 import org.apache.streampipes.model.DataSinkType;
 import org.apache.streampipes.model.graph.DataSinkDescription;
@@ -32,8 +33,7 @@ import org.apache.streampipes.sdk.helpers.EpRequirements;
 import org.apache.streampipes.sdk.helpers.Labels;
 import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventSinkRuntimeContext;
-import org.apache.streampipes.wrapper.standalone.SinkParams;
+import org.apache.streampipes.wrapper.params.compat.SinkParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataSink;
 
 import java.util.Map;
diff --git a/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/kafka/KafkaParameters.java b/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/kafka/KafkaParameters.java
index 6cb0459e3..8e534a417 100644
--- a/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/kafka/KafkaParameters.java
+++ b/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/kafka/KafkaParameters.java
@@ -19,8 +19,7 @@
 package org.apache.streampipes.sinks.brokers.jvm.kafka;
 
 import org.apache.streampipes.pe.shared.config.kafka.KafkaConnectUtils;
-import org.apache.streampipes.sdk.extractor.DataSinkParameterExtractor;
-import org.apache.streampipes.wrapper.standalone.SinkParams;
+import org.apache.streampipes.wrapper.params.compat.SinkParams;
 
 public class KafkaParameters {
 
@@ -39,7 +38,7 @@ public class KafkaParameters {
   private final boolean useSSL;
 
   public KafkaParameters(SinkParams params) {
-    DataSinkParameterExtractor extractor = params.extractor();
+    var extractor = params.extractor();
     this.topic = extractor.singleValueParameter(KafkaConnectUtils.TOPIC_KEY, String.class);
     this.kafkaHost = extractor.singleValueParameter(KafkaConnectUtils.HOST_KEY, String.class);
     this.kafkaPort = extractor.singleValueParameter(KafkaConnectUtils.PORT_KEY, Integer.class);
diff --git a/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/kafka/KafkaPublishSink.java b/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/kafka/KafkaPublishSink.java
index 72ad8f295..09ad02c5e 100644
--- a/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/kafka/KafkaPublishSink.java
+++ b/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/kafka/KafkaPublishSink.java
@@ -20,6 +20,7 @@ package org.apache.streampipes.sinks.brokers.jvm.kafka;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
 import org.apache.streampipes.dataformat.json.JsonDataFormatDefinition;
+import org.apache.streampipes.extensions.api.pe.context.EventSinkRuntimeContext;
 import org.apache.streampipes.messaging.kafka.SpKafkaProducer;
 import org.apache.streampipes.messaging.kafka.security.KafkaSecurityConfig;
 import org.apache.streampipes.messaging.kafka.security.KafkaSecuritySaslPlainConfig;
@@ -36,8 +37,7 @@ import org.apache.streampipes.sdk.helpers.EpRequirements;
 import org.apache.streampipes.sdk.helpers.Labels;
 import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventSinkRuntimeContext;
-import org.apache.streampipes.wrapper.standalone.SinkParams;
+import org.apache.streampipes.wrapper.params.compat.SinkParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataSink;
 
 import java.util.List;
diff --git a/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/mqtt/MqttClient.java b/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/mqtt/MqttClient.java
index 29c88dfc4..6c94691f5 100644
--- a/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/mqtt/MqttClient.java
+++ b/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/mqtt/MqttClient.java
@@ -22,7 +22,7 @@ import org.apache.streampipes.dataformat.json.JsonDataFormatDefinition;
 import org.apache.streampipes.model.runtime.Event;
 import org.apache.streampipes.sinks.brokers.jvm.mqtt.common.MqttOptions;
 import org.apache.streampipes.sinks.brokers.jvm.mqtt.common.MqttUtils;
-import org.apache.streampipes.wrapper.standalone.SinkParams;
+import org.apache.streampipes.wrapper.params.compat.SinkParams;
 
 import org.fusesource.mqtt.client.BlockingConnection;
 import org.fusesource.mqtt.client.MQTT;
diff --git a/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/mqtt/MqttPublisherSink.java b/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/mqtt/MqttPublisherSink.java
index 632bbcd9e..3d17ea399 100644
--- a/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/mqtt/MqttPublisherSink.java
+++ b/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/mqtt/MqttPublisherSink.java
@@ -18,6 +18,7 @@
 package org.apache.streampipes.sinks.brokers.jvm.mqtt;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventSinkRuntimeContext;
 import org.apache.streampipes.model.DataSinkType;
 import org.apache.streampipes.model.graph.DataSinkDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -29,8 +30,7 @@ import org.apache.streampipes.sdk.helpers.Alternatives;
 import org.apache.streampipes.sdk.helpers.Labels;
 import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventSinkRuntimeContext;
-import org.apache.streampipes.wrapper.standalone.SinkParams;
+import org.apache.streampipes.wrapper.params.compat.SinkParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataSink;
 
 import java.util.Arrays;
diff --git a/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/mqtt/common/MqttOptions.java b/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/mqtt/common/MqttOptions.java
index 50fce6e87..b5b6c3a53 100644
--- a/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/mqtt/common/MqttOptions.java
+++ b/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/mqtt/common/MqttOptions.java
@@ -17,8 +17,7 @@
  */
 package org.apache.streampipes.sinks.brokers.jvm.mqtt.common;
 
-import org.apache.streampipes.sdk.extractor.DataSinkParameterExtractor;
-import org.apache.streampipes.wrapper.standalone.SinkParams;
+import org.apache.streampipes.wrapper.params.compat.SinkParams;
 
 import org.fusesource.mqtt.client.QoS;
 
@@ -67,9 +66,9 @@ public class MqttOptions {
   private String mqttProtocolVersion = "3.1";
 
   public MqttOptions(SinkParams params) {
-    DataSinkParameterExtractor extract = params.extractor();
+    var extract = params.extractor();
 
-    this.clientId = MqttUtils.runningInstanceId(params.getGraph().getElementId());
+    this.clientId = MqttUtils.runningInstanceId(params.getModel().getElementId());
     this.topic = extract.singleValueParameter(TOPIC, String.class);
     this.host = extract.singleValueParameter(HOST, String.class);
     this.port = extract.singleValueParameter(PORT, Integer.class);
diff --git a/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/nats/NatsController.java b/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/nats/NatsController.java
index 90bc8361f..6959b4e7d 100644
--- a/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/nats/NatsController.java
+++ b/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/nats/NatsController.java
@@ -20,6 +20,7 @@ package org.apache.streampipes.sinks.brokers.jvm.nats;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
 import org.apache.streampipes.dataformat.json.JsonDataFormatDefinition;
+import org.apache.streampipes.extensions.api.pe.context.EventSinkRuntimeContext;
 import org.apache.streampipes.messaging.nats.NatsUtils;
 import org.apache.streampipes.model.DataSinkType;
 import org.apache.streampipes.model.graph.DataSinkDescription;
@@ -36,8 +37,7 @@ import org.apache.streampipes.sdk.helpers.EpRequirements;
 import org.apache.streampipes.sdk.helpers.Labels;
 import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventSinkRuntimeContext;
-import org.apache.streampipes.wrapper.standalone.SinkParams;
+import org.apache.streampipes.wrapper.params.compat.SinkParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataSink;
 
 import io.nats.client.Connection;
@@ -123,7 +123,7 @@ public class NatsController extends StreamPipesDataSink {
                            EventSinkRuntimeContext runtimeContext) throws SpRuntimeException {
     this.dataFormatDefinition = new JsonDataFormatDefinition();
     NatsConfig natsConfig = NatsConfigUtils.from(
-        StaticPropertyExtractor.from(parameters.getGraph().getStaticProperties()));
+        StaticPropertyExtractor.from(parameters.getModel().getStaticProperties()));
     this.subject = natsConfig.getSubject();
     Options options = NatsUtils.makeNatsOptions(natsConfig);
 
diff --git a/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/pulsar/PulsarParameters.java b/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/pulsar/PulsarParameters.java
index 1d6962c41..e7a9b3c17 100644
--- a/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/pulsar/PulsarParameters.java
+++ b/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/pulsar/PulsarParameters.java
@@ -17,8 +17,7 @@
  */
 package org.apache.streampipes.sinks.brokers.jvm.pulsar;
 
-import org.apache.streampipes.sdk.extractor.DataSinkParameterExtractor;
-import org.apache.streampipes.wrapper.standalone.SinkParams;
+import org.apache.streampipes.wrapper.params.compat.SinkParams;
 
 import static org.apache.streampipes.sinks.brokers.jvm.pulsar.PulsarPublisherSink.PULSAR_HOST_KEY;
 import static org.apache.streampipes.sinks.brokers.jvm.pulsar.PulsarPublisherSink.PULSAR_PORT_KEY;
@@ -30,7 +29,7 @@ public class PulsarParameters {
   private String topic;
 
   public PulsarParameters(SinkParams parameters) {
-    DataSinkParameterExtractor extractor = parameters.extractor();
+    var extractor = parameters.extractor();
 
     this.pulsarHost = extractor.singleValueParameter(PULSAR_HOST_KEY, String.class);
     this.pulsarPort = extractor.singleValueParameter(PULSAR_PORT_KEY, Integer.class);
diff --git a/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/pulsar/PulsarPublisherSink.java b/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/pulsar/PulsarPublisherSink.java
index a1b23a6b5..e555f7798 100644
--- a/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/pulsar/PulsarPublisherSink.java
+++ b/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/pulsar/PulsarPublisherSink.java
@@ -20,6 +20,7 @@ package org.apache.streampipes.sinks.brokers.jvm.pulsar;
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
 import org.apache.streampipes.dataformat.SpDataFormatDefinition;
 import org.apache.streampipes.dataformat.json.JsonDataFormatDefinition;
+import org.apache.streampipes.extensions.api.pe.context.EventSinkRuntimeContext;
 import org.apache.streampipes.model.DataSinkType;
 import org.apache.streampipes.model.graph.DataSinkDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -29,8 +30,7 @@ import org.apache.streampipes.sdk.helpers.EpRequirements;
 import org.apache.streampipes.sdk.helpers.Labels;
 import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventSinkRuntimeContext;
-import org.apache.streampipes.wrapper.standalone.SinkParams;
+import org.apache.streampipes.wrapper.params.compat.SinkParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataSink;
 
 import com.google.common.annotations.VisibleForTesting;
diff --git a/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/rabbitmq/RabbitMqPublisherSink.java b/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/rabbitmq/RabbitMqPublisherSink.java
index 4a603cb88..518498b1d 100644
--- a/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/rabbitmq/RabbitMqPublisherSink.java
+++ b/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/rabbitmq/RabbitMqPublisherSink.java
@@ -20,6 +20,7 @@ package org.apache.streampipes.sinks.brokers.jvm.rabbitmq;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
 import org.apache.streampipes.dataformat.json.JsonDataFormatDefinition;
+import org.apache.streampipes.extensions.api.pe.context.EventSinkRuntimeContext;
 import org.apache.streampipes.model.DataSinkType;
 import org.apache.streampipes.model.graph.DataSinkDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -30,8 +31,7 @@ import org.apache.streampipes.sdk.helpers.EpRequirements;
 import org.apache.streampipes.sdk.helpers.Labels;
 import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventSinkRuntimeContext;
-import org.apache.streampipes.wrapper.standalone.SinkParams;
+import org.apache.streampipes.wrapper.params.compat.SinkParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataSink;
 
 import org.slf4j.Logger;
diff --git a/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/rest/RestSink.java b/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/rest/RestSink.java
index 583b04fca..9449b80b3 100644
--- a/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/rest/RestSink.java
+++ b/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/rest/RestSink.java
@@ -21,6 +21,7 @@ package org.apache.streampipes.sinks.brokers.jvm.rest;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
 import org.apache.streampipes.dataformat.json.JsonDataFormatDefinition;
+import org.apache.streampipes.extensions.api.pe.context.EventSinkRuntimeContext;
 import org.apache.streampipes.model.DataSinkType;
 import org.apache.streampipes.model.graph.DataSinkDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -30,8 +31,7 @@ import org.apache.streampipes.sdk.helpers.EpRequirements;
 import org.apache.streampipes.sdk.helpers.Labels;
 import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventSinkRuntimeContext;
-import org.apache.streampipes.wrapper.standalone.SinkParams;
+import org.apache.streampipes.wrapper.params.compat.SinkParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataSink;
 
 import org.apache.http.client.fluent.Request;
diff --git a/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/rocketmq/RocketMQParameters.java b/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/rocketmq/RocketMQParameters.java
index f0efc336e..404119377 100644
--- a/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/rocketmq/RocketMQParameters.java
+++ b/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/rocketmq/RocketMQParameters.java
@@ -17,8 +17,7 @@
  */
 package org.apache.streampipes.sinks.brokers.jvm.rocketmq;
 
-import org.apache.streampipes.sdk.extractor.DataSinkParameterExtractor;
-import org.apache.streampipes.wrapper.standalone.SinkParams;
+import org.apache.streampipes.wrapper.params.compat.SinkParams;
 
 import static org.apache.streampipes.sinks.brokers.jvm.rocketmq.RocketMQPublisherSink.ENDPOINT_KEY;
 import static org.apache.streampipes.sinks.brokers.jvm.rocketmq.RocketMQPublisherSink.TOPIC_KEY;
@@ -28,7 +27,7 @@ public class RocketMQParameters {
   private String topic;
 
   public RocketMQParameters(SinkParams parameters) {
-    DataSinkParameterExtractor extractor = parameters.extractor();
+    var extractor = parameters.extractor();
 
     this.endpoint = extractor.singleValueParameter(ENDPOINT_KEY, String.class);
     this.topic = extractor.singleValueParameter(TOPIC_KEY, String.class);
diff --git a/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/rocketmq/RocketMQPublisherSink.java b/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/rocketmq/RocketMQPublisherSink.java
index 3f610cf14..ad6532d3b 100644
--- a/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/rocketmq/RocketMQPublisherSink.java
+++ b/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/rocketmq/RocketMQPublisherSink.java
@@ -21,6 +21,7 @@ package org.apache.streampipes.sinks.brokers.jvm.rocketmq;
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
 import org.apache.streampipes.dataformat.SpDataFormatDefinition;
 import org.apache.streampipes.dataformat.json.JsonDataFormatDefinition;
+import org.apache.streampipes.extensions.api.pe.context.EventSinkRuntimeContext;
 import org.apache.streampipes.model.DataSinkType;
 import org.apache.streampipes.model.graph.DataSinkDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -30,8 +31,7 @@ import org.apache.streampipes.sdk.helpers.EpRequirements;
 import org.apache.streampipes.sdk.helpers.Labels;
 import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventSinkRuntimeContext;
-import org.apache.streampipes.wrapper.standalone.SinkParams;
+import org.apache.streampipes.wrapper.params.compat.SinkParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataSink;
 
 import com.google.common.annotations.VisibleForTesting;
diff --git a/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/tubemq/TubeMQParameters.java b/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/tubemq/TubeMQParameters.java
index 9a81f8b51..5a6c75a84 100644
--- a/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/tubemq/TubeMQParameters.java
+++ b/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/tubemq/TubeMQParameters.java
@@ -18,8 +18,7 @@
 
 package org.apache.streampipes.sinks.brokers.jvm.tubemq;
 
-import org.apache.streampipes.sdk.extractor.DataSinkParameterExtractor;
-import org.apache.streampipes.wrapper.standalone.SinkParams;
+import org.apache.streampipes.wrapper.params.compat.SinkParams;
 
 import static org.apache.streampipes.sinks.brokers.jvm.tubemq.TubeMQPublisherSink.MASTER_HOST_AND_PORT_KEY;
 import static org.apache.streampipes.sinks.brokers.jvm.tubemq.TubeMQPublisherSink.TOPIC_KEY;
@@ -30,7 +29,7 @@ public class TubeMQParameters {
   private final String topic;
 
   public TubeMQParameters(SinkParams parameters) {
-    DataSinkParameterExtractor extractor = parameters.extractor();
+    var extractor = parameters.extractor();
 
     this.masterHostAndPort = extractor.singleValueParameter(MASTER_HOST_AND_PORT_KEY, String.class);
     this.topic = extractor.singleValueParameter(TOPIC_KEY, String.class);
diff --git a/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/tubemq/TubeMQPublisherSink.java b/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/tubemq/TubeMQPublisherSink.java
index deeb2dcc3..3238cfabf 100644
--- a/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/tubemq/TubeMQPublisherSink.java
+++ b/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/tubemq/TubeMQPublisherSink.java
@@ -21,6 +21,7 @@ package org.apache.streampipes.sinks.brokers.jvm.tubemq;
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
 import org.apache.streampipes.dataformat.SpDataFormatDefinition;
 import org.apache.streampipes.dataformat.json.JsonDataFormatDefinition;
+import org.apache.streampipes.extensions.api.pe.context.EventSinkRuntimeContext;
 import org.apache.streampipes.model.DataSinkType;
 import org.apache.streampipes.model.graph.DataSinkDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -30,8 +31,7 @@ import org.apache.streampipes.sdk.helpers.EpRequirements;
 import org.apache.streampipes.sdk.helpers.Labels;
 import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventSinkRuntimeContext;
-import org.apache.streampipes.wrapper.standalone.SinkParams;
+import org.apache.streampipes.wrapper.params.compat.SinkParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataSink;
 
 import org.apache.inlong.tubemq.client.config.TubeClientConfig;
diff --git a/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/websocket/WebsocketServerSink.java b/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/websocket/WebsocketServerSink.java
index 64e64b420..c48711887 100644
--- a/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/websocket/WebsocketServerSink.java
+++ b/streampipes-extensions/streampipes-sinks-brokers-jvm/src/main/java/org/apache/streampipes/sinks/brokers/jvm/websocket/WebsocketServerSink.java
@@ -19,6 +19,7 @@
 package org.apache.streampipes.sinks.brokers.jvm.websocket;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventSinkRuntimeContext;
 import org.apache.streampipes.model.DataSinkType;
 import org.apache.streampipes.model.graph.DataSinkDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -28,8 +29,7 @@ import org.apache.streampipes.sdk.helpers.EpRequirements;
 import org.apache.streampipes.sdk.helpers.Labels;
 import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventSinkRuntimeContext;
-import org.apache.streampipes.wrapper.standalone.SinkParams;
+import org.apache.streampipes.wrapper.params.compat.SinkParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataSink;
 
 import java.io.IOException;
diff --git a/streampipes-extensions/streampipes-sinks-brokers-jvm/src/test/java/org/apache/streampipes/sinks/brokers/jvm/pulsar/TestPulsarParameters.java b/streampipes-extensions/streampipes-sinks-brokers-jvm/src/test/java/org/apache/streampipes/sinks/brokers/jvm/pulsar/TestPulsarParameters.java
index 653c48f31..0ce79dbb4 100644
--- a/streampipes-extensions/streampipes-sinks-brokers-jvm/src/test/java/org/apache/streampipes/sinks/brokers/jvm/pulsar/TestPulsarParameters.java
+++ b/streampipes-extensions/streampipes-sinks-brokers-jvm/src/test/java/org/apache/streampipes/sinks/brokers/jvm/pulsar/TestPulsarParameters.java
@@ -18,7 +18,7 @@
 package org.apache.streampipes.sinks.brokers.jvm.pulsar;
 
 import org.apache.streampipes.sdk.extractor.DataSinkParameterExtractor;
-import org.apache.streampipes.wrapper.standalone.SinkParams;
+import org.apache.streampipes.wrapper.params.compat.SinkParams;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/streampipes-extensions/streampipes-sinks-brokers-jvm/src/test/java/org/apache/streampipes/sinks/brokers/jvm/pulsar/TestPulsarPublisherSink.java b/streampipes-extensions/streampipes-sinks-brokers-jvm/src/test/java/org/apache/streampipes/sinks/brokers/jvm/pulsar/TestPulsarPublisherSink.java
index 2267bcad4..33be52170 100644
--- a/streampipes-extensions/streampipes-sinks-brokers-jvm/src/test/java/org/apache/streampipes/sinks/brokers/jvm/pulsar/TestPulsarPublisherSink.java
+++ b/streampipes-extensions/streampipes-sinks-brokers-jvm/src/test/java/org/apache/streampipes/sinks/brokers/jvm/pulsar/TestPulsarPublisherSink.java
@@ -19,7 +19,7 @@ package org.apache.streampipes.sinks.brokers.jvm.pulsar;
 
 import org.apache.streampipes.model.runtime.Event;
 import org.apache.streampipes.sdk.extractor.DataSinkParameterExtractor;
-import org.apache.streampipes.wrapper.standalone.SinkParams;
+import org.apache.streampipes.wrapper.params.compat.SinkParams;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/streampipes-extensions/streampipes-sinks-brokers-jvm/src/test/java/org/apache/streampipes/sinks/brokers/jvm/rocketmq/TestRocketMQPublisherSink.java b/streampipes-extensions/streampipes-sinks-brokers-jvm/src/test/java/org/apache/streampipes/sinks/brokers/jvm/rocketmq/TestRocketMQPublisherSink.java
index 74655e2f0..80053ed79 100644
--- a/streampipes-extensions/streampipes-sinks-brokers-jvm/src/test/java/org/apache/streampipes/sinks/brokers/jvm/rocketmq/TestRocketMQPublisherSink.java
+++ b/streampipes-extensions/streampipes-sinks-brokers-jvm/src/test/java/org/apache/streampipes/sinks/brokers/jvm/rocketmq/TestRocketMQPublisherSink.java
@@ -19,7 +19,7 @@ package org.apache.streampipes.sinks.brokers.jvm.rocketmq;
 
 import org.apache.streampipes.model.runtime.Event;
 import org.apache.streampipes.sdk.extractor.DataSinkParameterExtractor;
-import org.apache.streampipes.wrapper.standalone.SinkParams;
+import org.apache.streampipes.wrapper.params.compat.SinkParams;
 
 import org.apache.rocketmq.client.apis.ClientException;
 import org.apache.rocketmq.client.apis.ClientServiceProvider;
diff --git a/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/ElasticSearchController.java b/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/ElasticSearchController.java
index 612392455..3913b9b7e 100644
--- a/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/ElasticSearchController.java
+++ b/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/ElasticSearchController.java
@@ -18,22 +18,19 @@
 
 package org.apache.streampipes.sinks.databases.flink.elasticsearch;
 
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
+import org.apache.streampipes.extensions.api.extractor.IDataSinkParameterExtractor;
 import org.apache.streampipes.model.DataSinkType;
 import org.apache.streampipes.model.graph.DataSinkDescription;
 import org.apache.streampipes.model.graph.DataSinkInvocation;
 import org.apache.streampipes.model.schema.PropertyScope;
 import org.apache.streampipes.sdk.builder.DataSinkBuilder;
 import org.apache.streampipes.sdk.builder.StreamRequirementsBuilder;
-import org.apache.streampipes.sdk.extractor.DataSinkParameterExtractor;
 import org.apache.streampipes.sdk.helpers.EpRequirements;
 import org.apache.streampipes.sdk.helpers.Labels;
 import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.sinks.databases.flink.config.ConfigKeys;
 import org.apache.streampipes.wrapper.flink.FlinkDataSinkDeclarer;
-import org.apache.streampipes.wrapper.flink.FlinkDataSinkRuntime;
+import org.apache.streampipes.wrapper.flink.FlinkDataSinkProgram;
 
 public class ElasticSearchController extends FlinkDataSinkDeclarer<ElasticSearchParameters> {
 
@@ -56,20 +53,19 @@ public class ElasticSearchController extends FlinkDataSinkDeclarer<ElasticSearch
   }
 
   @Override
-  public FlinkDataSinkRuntime<ElasticSearchParameters> getRuntime(DataSinkInvocation graph,
-                                                                  DataSinkParameterExtractor extractor,
-                                                                  ConfigExtractor configExtractor,
-                                                                  StreamPipesClient streamPipesClient) {
+  public FlinkDataSinkProgram<ElasticSearchParameters> getProgram(DataSinkInvocation graph,
+                                                                  IDataSinkParameterExtractor extractor) {
 
     String timestampField = extractor.mappingPropertyValue(TIMESTAMP_MAPPING);
     String indexName = extractor.singleValueParameter(INDEX_NAME, String.class);
-    String elasticsearchHost = configExtractor.getConfig().getString(ConfigKeys.ELASTIC_HOST);
-    Integer elasticsearchPort = configExtractor.getConfig().getInteger(ConfigKeys.ELASTIC_PORT_REST);
+    //TODO after refactoring
+    // String elasticsearchHost = configExtractor.getConfig().getString(ConfigKeys.ELASTIC_HOST);
+    //Integer elasticsearchPort = configExtractor.getConfig().getInteger(ConfigKeys.ELASTIC_PORT_REST);
 
     ElasticSearchParameters params =
-        new ElasticSearchParameters(graph, timestampField, indexName, elasticsearchHost, elasticsearchPort);
+        new ElasticSearchParameters(graph, timestampField, indexName, null, null);
 
-    return new ElasticSearchProgram(params, configExtractor, streamPipesClient);
+    return new ElasticSearchProgram(params);
 
   }
 
diff --git a/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/ElasticSearchParameters.java b/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/ElasticSearchParameters.java
index 2ededc09d..397f03213 100644
--- a/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/ElasticSearchParameters.java
+++ b/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/ElasticSearchParameters.java
@@ -19,9 +19,9 @@
 package org.apache.streampipes.sinks.databases.flink.elasticsearch;
 
 import org.apache.streampipes.model.graph.DataSinkInvocation;
-import org.apache.streampipes.wrapper.params.binding.EventSinkBindingParams;
+import org.apache.streampipes.wrapper.params.compat.SinkParams;
 
-public class ElasticSearchParameters extends EventSinkBindingParams {
+public class ElasticSearchParameters extends SinkParams {
 
   private String timestampField;
   private String indexName;
diff --git a/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/ElasticSearchProgram.java b/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/ElasticSearchProgram.java
index c046c61f5..bf121c24b 100644
--- a/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/ElasticSearchProgram.java
+++ b/streampipes-extensions/streampipes-sinks-databases-flink/src/main/java/org/apache/streampipes/sinks/databases/flink/elasticsearch/ElasticSearchProgram.java
@@ -19,14 +19,9 @@
 package org.apache.streampipes.sinks.databases.flink.elasticsearch;
 
 
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
 import org.apache.streampipes.model.runtime.Event;
-import org.apache.streampipes.sinks.databases.flink.config.ConfigKeys;
 import org.apache.streampipes.sinks.databases.flink.elasticsearch.elastic.ElasticsearchSink;
-import org.apache.streampipes.svcdiscovery.api.SpConfig;
-import org.apache.streampipes.wrapper.flink.FlinkDataSinkRuntime;
-import org.apache.streampipes.wrapper.flink.FlinkDeploymentConfig;
+import org.apache.streampipes.wrapper.flink.FlinkDataSinkProgram;
 
 import org.apache.flink.api.common.functions.FlatMapFunction;
 import org.apache.flink.streaming.api.datastream.DataStream;
@@ -40,36 +35,23 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class ElasticSearchProgram extends FlinkDataSinkRuntime<ElasticSearchParameters> implements Serializable {
+public class ElasticSearchProgram extends FlinkDataSinkProgram<ElasticSearchParameters> implements Serializable {
 
   private static final long serialVersionUID = 1L;
   private static final String INDEX_NAME_PREFIX = "sp_";
 
-  public ElasticSearchProgram(ElasticSearchParameters params,
-                              ConfigExtractor configExtractor,
-                              StreamPipesClient streamPipesClient) {
-    super(params, configExtractor, streamPipesClient);
-  }
-
-  @Override
-  protected FlinkDeploymentConfig getDeploymentConfig(ConfigExtractor configExtractor) {
-    SpConfig config = configExtractor.getConfig();
-    return new FlinkDeploymentConfig(config.getString(
-        ConfigKeys.FLINK_JAR_FILE_LOC),
-        config.getString(ConfigKeys.FLINK_HOST),
-        config.getInteger(ConfigKeys.FLINK_PORT),
-        config.getBoolean(ConfigKeys.DEBUG)
-    );
+  public ElasticSearchProgram(ElasticSearchParameters params) {
+    super(params);
   }
 
   @Override
   public void getSink(
       DataStream<Event>... convertedStream) {
 
-    String indexName = bindingParams.getIndexName();
-    String timeName = bindingParams.getTimestampField();
-    String elasticsearchHost = bindingParams.getElasticsearchHost();
-    Integer elasticsearchPort = bindingParams.getElasticsearchPort();
+    String indexName = params.getIndexName();
+    String timeName = params.getTimestampField();
+    String elasticsearchHost = params.getElasticsearchHost();
+    Integer elasticsearchPort = params.getElasticsearchPort();
 
     List<HttpHost> httpHosts = Arrays.asList(new HttpHost(
         elasticsearchHost,
diff --git a/streampipes-extensions/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/couchdb/CouchDbSink.java b/streampipes-extensions/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/couchdb/CouchDbSink.java
index 775ddf131..38b01cf92 100644
--- a/streampipes-extensions/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/couchdb/CouchDbSink.java
+++ b/streampipes-extensions/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/couchdb/CouchDbSink.java
@@ -19,6 +19,7 @@
 package org.apache.streampipes.sinks.databases.jvm.couchdb;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventSinkRuntimeContext;
 import org.apache.streampipes.model.DataSinkType;
 import org.apache.streampipes.model.graph.DataSinkDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -29,8 +30,7 @@ import org.apache.streampipes.sdk.helpers.EpRequirements;
 import org.apache.streampipes.sdk.helpers.Labels;
 import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventSinkRuntimeContext;
-import org.apache.streampipes.wrapper.standalone.SinkParams;
+import org.apache.streampipes.wrapper.params.compat.SinkParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataSink;
 
 import org.lightcouch.CouchDbClient;
diff --git a/streampipes-extensions/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/ditto/DittoSink.java b/streampipes-extensions/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/ditto/DittoSink.java
index d4b8086cd..6d7cc3c51 100644
--- a/streampipes-extensions/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/ditto/DittoSink.java
+++ b/streampipes-extensions/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/ditto/DittoSink.java
@@ -18,6 +18,7 @@
 package org.apache.streampipes.sinks.databases.jvm.ditto;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventSinkRuntimeContext;
 import org.apache.streampipes.model.DataSinkType;
 import org.apache.streampipes.model.graph.DataSinkDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -28,8 +29,7 @@ import org.apache.streampipes.sdk.helpers.EpRequirements;
 import org.apache.streampipes.sdk.helpers.Labels;
 import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventSinkRuntimeContext;
-import org.apache.streampipes.wrapper.standalone.SinkParams;
+import org.apache.streampipes.wrapper.params.compat.SinkParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataSink;
 
 import org.eclipse.ditto.client.DittoClient;
diff --git a/streampipes-extensions/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/iotdb/IotDbSink.java b/streampipes-extensions/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/iotdb/IotDbSink.java
index 2af93034b..5d0093ead 100644
--- a/streampipes-extensions/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/iotdb/IotDbSink.java
+++ b/streampipes-extensions/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/iotdb/IotDbSink.java
@@ -19,6 +19,7 @@
 package org.apache.streampipes.sinks.databases.jvm.iotdb;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventSinkRuntimeContext;
 import org.apache.streampipes.model.DataSinkType;
 import org.apache.streampipes.model.graph.DataSinkDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -30,8 +31,7 @@ import org.apache.streampipes.sdk.helpers.EpRequirements;
 import org.apache.streampipes.sdk.helpers.Labels;
 import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventSinkRuntimeContext;
-import org.apache.streampipes.wrapper.standalone.SinkParams;
+import org.apache.streampipes.wrapper.params.compat.SinkParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataSink;
 
 import org.apache.iotdb.rpc.IoTDBConnectionException;
diff --git a/streampipes-extensions/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/jdbcclient/model/JdbcConnectionParameters.java b/streampipes-extensions/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/jdbcclient/model/JdbcConnectionParameters.java
index 2a006bc48..13567c2bc 100644
--- a/streampipes-extensions/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/jdbcclient/model/JdbcConnectionParameters.java
+++ b/streampipes-extensions/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/jdbcclient/model/JdbcConnectionParameters.java
@@ -19,9 +19,10 @@
 package org.apache.streampipes.sinks.databases.jvm.jdbcclient.model;
 
 import org.apache.streampipes.model.graph.DataSinkInvocation;
-import org.apache.streampipes.wrapper.params.binding.EventSinkBindingParams;
 
-public class JdbcConnectionParameters extends EventSinkBindingParams {
+public class JdbcConnectionParameters {
+
+  private DataSinkInvocation graph;
 
   private String dbHost;
   private Integer dbPort;
@@ -43,7 +44,7 @@ public class JdbcConnectionParameters extends EventSinkBindingParams {
                                   boolean sslEnabled,
                                   String sslFactory,
                                   boolean quotedColumnNames) {
-    super(graph);
+    this.graph = graph;
     this.dbHost = dbHost;
     this.dbPort = dbPort;
     this.dbName = dbName;
@@ -91,4 +92,8 @@ public class JdbcConnectionParameters extends EventSinkBindingParams {
   public boolean isColumnNameQuoted() {
     return columnNameQuoted;
   }
+
+  public DataSinkInvocation getGraph() {
+    return graph;
+  }
 }
diff --git a/streampipes-extensions/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/opcua/OpcUaSink.java b/streampipes-extensions/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/opcua/OpcUaSink.java
index a66d89f97..f4e4c3e93 100644
--- a/streampipes-extensions/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/opcua/OpcUaSink.java
+++ b/streampipes-extensions/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/opcua/OpcUaSink.java
@@ -19,6 +19,7 @@
 package org.apache.streampipes.sinks.databases.jvm.opcua;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventSinkRuntimeContext;
 import org.apache.streampipes.model.DataSinkType;
 import org.apache.streampipes.model.graph.DataSinkDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -29,8 +30,7 @@ import org.apache.streampipes.sdk.helpers.EpRequirements;
 import org.apache.streampipes.sdk.helpers.Labels;
 import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventSinkRuntimeContext;
-import org.apache.streampipes.wrapper.standalone.SinkParams;
+import org.apache.streampipes.wrapper.params.compat.SinkParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataSink;
 
 public class OpcUaSink extends StreamPipesDataSink {
diff --git a/streampipes-extensions/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/postgresql/PostgreSqlSink.java b/streampipes-extensions/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/postgresql/PostgreSqlSink.java
index 6638a7f99..7f8856f7f 100644
--- a/streampipes-extensions/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/postgresql/PostgreSqlSink.java
+++ b/streampipes-extensions/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/postgresql/PostgreSqlSink.java
@@ -19,6 +19,7 @@
 package org.apache.streampipes.sinks.databases.jvm.postgresql;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventSinkRuntimeContext;
 import org.apache.streampipes.model.DataSinkType;
 import org.apache.streampipes.model.graph.DataSinkDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -30,8 +31,7 @@ import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.Options;
 import org.apache.streampipes.sdk.helpers.Tuple2;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventSinkRuntimeContext;
-import org.apache.streampipes.wrapper.standalone.SinkParams;
+import org.apache.streampipes.wrapper.params.compat.SinkParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataSink;
 
 public class PostgreSqlSink extends StreamPipesDataSink {
@@ -82,7 +82,8 @@ public class PostgreSqlSink extends StreamPipesDataSink {
     String password = extractor.secretValue(DATABASE_PASSWORD_KEY);
     String sslSelection = extractor.selectedSingleValueInternalName(SSL_MODE, String.class);
 
-    PostgreSqlParameters params = new PostgreSqlParameters(parameters.getGraph(),
+    PostgreSqlParameters params = new PostgreSqlParameters(
+        parameters.getModel(),
         hostname,
         port,
         dbName,
diff --git a/streampipes-extensions/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/redis/RedisSink.java b/streampipes-extensions/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/redis/RedisSink.java
index e68a5c525..6cda27151 100644
--- a/streampipes-extensions/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/redis/RedisSink.java
+++ b/streampipes-extensions/streampipes-sinks-databases-jvm/src/main/java/org/apache/streampipes/sinks/databases/jvm/redis/RedisSink.java
@@ -19,20 +19,19 @@
 package org.apache.streampipes.sinks.databases.jvm.redis;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventSinkRuntimeContext;
 import org.apache.streampipes.model.DataSinkType;
 import org.apache.streampipes.model.graph.DataSinkDescription;
 import org.apache.streampipes.model.runtime.Event;
 import org.apache.streampipes.model.schema.PropertyScope;
 import org.apache.streampipes.sdk.builder.DataSinkBuilder;
 import org.apache.streampipes.sdk.builder.StreamRequirementsBuilder;
-import org.apache.streampipes.sdk.extractor.DataSinkParameterExtractor;
 import org.apache.streampipes.sdk.helpers.EpRequirements;
 import org.apache.streampipes.sdk.helpers.Labels;
 import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.Options;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventSinkRuntimeContext;
-import org.apache.streampipes.wrapper.standalone.SinkParams;
+import org.apache.streampipes.wrapper.params.compat.SinkParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataSink;
 
 public class RedisSink extends StreamPipesDataSink {
@@ -91,7 +90,7 @@ public class RedisSink extends StreamPipesDataSink {
 
   @Override
   public void onInvocation(SinkParams parameters, EventSinkRuntimeContext runtimeContext) throws SpRuntimeException {
-    DataSinkParameterExtractor extractor = parameters.extractor();
+    var extractor = parameters.extractor();
     String redisHost = extractor.singleValueParameter(REDIS_HOST_KEY, String.class);
     Integer redisPort = extractor.singleValueParameter(REDIS_PORT_KEY, Integer.class);
     String primaryKey = extractor.mappingPropertyValue(EVENT_PRIMARY_KEY);
diff --git a/streampipes-extensions/streampipes-sinks-internal-jvm/src/main/java/org/apache/streampipes/sinks/internal/jvm/datalake/DataLakeSink.java b/streampipes-extensions/streampipes-sinks-internal-jvm/src/main/java/org/apache/streampipes/sinks/internal/jvm/datalake/DataLakeSink.java
index e23dd1879..23557e7d7 100644
--- a/streampipes-extensions/streampipes-sinks-internal-jvm/src/main/java/org/apache/streampipes/sinks/internal/jvm/datalake/DataLakeSink.java
+++ b/streampipes-extensions/streampipes-sinks-internal-jvm/src/main/java/org/apache/streampipes/sinks/internal/jvm/datalake/DataLakeSink.java
@@ -21,6 +21,7 @@ package org.apache.streampipes.sinks.internal.jvm.datalake;
 import org.apache.streampipes.commons.environment.Environments;
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
 import org.apache.streampipes.dataexplorer.commons.TimeSeriesStore;
+import org.apache.streampipes.extensions.api.pe.context.EventSinkRuntimeContext;
 import org.apache.streampipes.model.DataSinkType;
 import org.apache.streampipes.model.datalake.DataLakeMeasure;
 import org.apache.streampipes.model.graph.DataSinkDescription;
@@ -33,8 +34,7 @@ import org.apache.streampipes.sdk.helpers.EpRequirements;
 import org.apache.streampipes.sdk.helpers.Labels;
 import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventSinkRuntimeContext;
-import org.apache.streampipes.wrapper.standalone.SinkParams;
+import org.apache.streampipes.wrapper.params.compat.SinkParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataSink;
 
 
@@ -66,7 +66,7 @@ public class DataLakeSink extends StreamPipesDataSink {
   public void onInvocation(SinkParams parameters, EventSinkRuntimeContext runtimeContext) throws SpRuntimeException {
     String timestampField = parameters.extractor().mappingPropertyValue(TIMESTAMP_MAPPING_KEY);
     String measureName = parameters.extractor().singleValueParameter(DATABASE_MEASUREMENT_KEY, String.class);
-    EventSchema eventSchema = runtimeContext.getInputSchemaInfo().get(0).getEventSchema();
+    EventSchema eventSchema = parameters.getInputSchemaInfos().get(0).getEventSchema();
 
     DataLakeMeasure measure = new DataLakeMeasure(measureName, timestampField, eventSchema);
 
diff --git a/streampipes-extensions/streampipes-sinks-internal-jvm/src/main/java/org/apache/streampipes/sinks/internal/jvm/notification/NotificationProducer.java b/streampipes-extensions/streampipes-sinks-internal-jvm/src/main/java/org/apache/streampipes/sinks/internal/jvm/notification/NotificationProducer.java
index 5dd8efe8c..4ec5efc87 100644
--- a/streampipes-extensions/streampipes-sinks-internal-jvm/src/main/java/org/apache/streampipes/sinks/internal/jvm/notification/NotificationProducer.java
+++ b/streampipes-extensions/streampipes-sinks-internal-jvm/src/main/java/org/apache/streampipes/sinks/internal/jvm/notification/NotificationProducer.java
@@ -19,8 +19,9 @@
 package org.apache.streampipes.sinks.internal.jvm.notification;
 
 
-import org.apache.streampipes.client.StreamPipesClient;
+import org.apache.streampipes.client.api.IStreamPipesClient;
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventSinkRuntimeContext;
 import org.apache.streampipes.model.DataSinkType;
 import org.apache.streampipes.model.Notification;
 import org.apache.streampipes.model.graph.DataSinkDescription;
@@ -32,8 +33,7 @@ import org.apache.streampipes.sdk.helpers.EpRequirements;
 import org.apache.streampipes.sdk.helpers.Labels;
 import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventSinkRuntimeContext;
-import org.apache.streampipes.wrapper.standalone.SinkParams;
+import org.apache.streampipes.wrapper.params.compat.SinkParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataSink;
 
 import java.time.Instant;
@@ -56,7 +56,7 @@ public class NotificationProducer extends StreamPipesDataSink {
   private String correspondingPipelineId;
   private String correspondingUser;
 
-  private StreamPipesClient client;
+  private IStreamPipesClient client;
 
 
   @Override
@@ -65,8 +65,8 @@ public class NotificationProducer extends StreamPipesDataSink {
     this.title = parameters.extractor().singleValueParameter(TITLE_KEY, String.class);
     this.content = parameters.extractor().singleValueParameter(CONTENT_KEY, String.class);
     this.silentPeriodInSeconds = parameters.extractor().singleValueParameter(SILENT_PERIOD, Integer.class) * 60;
-    this.correspondingPipelineId = parameters.getGraph().getCorrespondingPipeline();
-    this.correspondingUser = parameters.getGraph().getCorrespondingUser();
+    this.correspondingPipelineId = parameters.getModel().getCorrespondingPipeline();
+    this.correspondingUser = parameters.getModel().getCorrespondingUser();
     this.client = context.getStreamPipesClient();
   }
 
diff --git a/streampipes-extensions/streampipes-sinks-notifications-jvm/src/main/java/org/apache/streampipes/sinks/notifications/jvm/email/EmailSink.java b/streampipes-extensions/streampipes-sinks-notifications-jvm/src/main/java/org/apache/streampipes/sinks/notifications/jvm/email/EmailSink.java
index 46ed25e6a..c41436fd2 100644
--- a/streampipes-extensions/streampipes-sinks-notifications-jvm/src/main/java/org/apache/streampipes/sinks/notifications/jvm/email/EmailSink.java
+++ b/streampipes-extensions/streampipes-sinks-notifications-jvm/src/main/java/org/apache/streampipes/sinks/notifications/jvm/email/EmailSink.java
@@ -18,8 +18,9 @@
 
 package org.apache.streampipes.sinks.notifications.jvm.email;
 
-import org.apache.streampipes.client.StreamPipesClient;
+import org.apache.streampipes.client.api.IStreamPipesClient;
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventSinkRuntimeContext;
 import org.apache.streampipes.model.DataSinkType;
 import org.apache.streampipes.model.graph.DataSinkDescription;
 import org.apache.streampipes.model.mail.SpEmail;
@@ -31,8 +32,7 @@ import org.apache.streampipes.sdk.helpers.EpRequirements;
 import org.apache.streampipes.sdk.helpers.Labels;
 import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventSinkRuntimeContext;
-import org.apache.streampipes.wrapper.standalone.SinkParams;
+import org.apache.streampipes.wrapper.params.compat.SinkParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataSink;
 
 import java.time.Instant;
@@ -51,7 +51,7 @@ public class EmailSink extends StreamPipesDataSink {
 
   private String originalContent;
 
-  private StreamPipesClient client;
+  private IStreamPipesClient client;
 
   @Override
   public DataSinkDescription declareModel() {
diff --git a/streampipes-extensions/streampipes-sinks-notifications-jvm/src/main/java/org/apache/streampipes/sinks/notifications/jvm/onesignal/OneSignalSink.java b/streampipes-extensions/streampipes-sinks-notifications-jvm/src/main/java/org/apache/streampipes/sinks/notifications/jvm/onesignal/OneSignalSink.java
index 7481ce39c..ea3a317c3 100644
--- a/streampipes-extensions/streampipes-sinks-notifications-jvm/src/main/java/org/apache/streampipes/sinks/notifications/jvm/onesignal/OneSignalSink.java
+++ b/streampipes-extensions/streampipes-sinks-notifications-jvm/src/main/java/org/apache/streampipes/sinks/notifications/jvm/onesignal/OneSignalSink.java
@@ -19,6 +19,7 @@
 package org.apache.streampipes.sinks.notifications.jvm.onesignal;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventSinkRuntimeContext;
 import org.apache.streampipes.model.DataSinkType;
 import org.apache.streampipes.model.graph.DataSinkDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -28,8 +29,7 @@ import org.apache.streampipes.sdk.helpers.EpRequirements;
 import org.apache.streampipes.sdk.helpers.Labels;
 import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventSinkRuntimeContext;
-import org.apache.streampipes.wrapper.standalone.SinkParams;
+import org.apache.streampipes.wrapper.params.compat.SinkParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataSink;
 
 import org.apache.http.HttpEntity;
diff --git a/streampipes-extensions/streampipes-sinks-notifications-jvm/src/main/java/org/apache/streampipes/sinks/notifications/jvm/slack/SlackNotificationSink.java b/streampipes-extensions/streampipes-sinks-notifications-jvm/src/main/java/org/apache/streampipes/sinks/notifications/jvm/slack/SlackNotificationSink.java
index 60bce1e06..2cdc611af 100644
--- a/streampipes-extensions/streampipes-sinks-notifications-jvm/src/main/java/org/apache/streampipes/sinks/notifications/jvm/slack/SlackNotificationSink.java
+++ b/streampipes-extensions/streampipes-sinks-notifications-jvm/src/main/java/org/apache/streampipes/sinks/notifications/jvm/slack/SlackNotificationSink.java
@@ -19,6 +19,7 @@
 package org.apache.streampipes.sinks.notifications.jvm.slack;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventSinkRuntimeContext;
 import org.apache.streampipes.model.DataSinkType;
 import org.apache.streampipes.model.graph.DataSinkDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -29,8 +30,7 @@ import org.apache.streampipes.sdk.helpers.Labels;
 import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.helpers.Options;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventSinkRuntimeContext;
-import org.apache.streampipes.wrapper.standalone.SinkParams;
+import org.apache.streampipes.wrapper.params.compat.SinkParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataSink;
 
 import com.ullink.slack.simpleslackapi.SlackChannel;
diff --git a/streampipes-extensions/streampipes-sinks-notifications-jvm/src/main/java/org/apache/streampipes/sinks/notifications/jvm/telegram/TelegramSink.java b/streampipes-extensions/streampipes-sinks-notifications-jvm/src/main/java/org/apache/streampipes/sinks/notifications/jvm/telegram/TelegramSink.java
index 5dffe1c78..73edd3eb1 100644
--- a/streampipes-extensions/streampipes-sinks-notifications-jvm/src/main/java/org/apache/streampipes/sinks/notifications/jvm/telegram/TelegramSink.java
+++ b/streampipes-extensions/streampipes-sinks-notifications-jvm/src/main/java/org/apache/streampipes/sinks/notifications/jvm/telegram/TelegramSink.java
@@ -19,6 +19,7 @@
 package org.apache.streampipes.sinks.notifications.jvm.telegram;
 
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.context.EventSinkRuntimeContext;
 import org.apache.streampipes.model.DataSinkType;
 import org.apache.streampipes.model.graph.DataSinkDescription;
 import org.apache.streampipes.model.runtime.Event;
@@ -28,8 +29,7 @@ import org.apache.streampipes.sdk.helpers.EpRequirements;
 import org.apache.streampipes.sdk.helpers.Labels;
 import org.apache.streampipes.sdk.helpers.Locales;
 import org.apache.streampipes.sdk.utils.Assets;
-import org.apache.streampipes.wrapper.context.EventSinkRuntimeContext;
-import org.apache.streampipes.wrapper.standalone.SinkParams;
+import org.apache.streampipes.wrapper.params.compat.SinkParams;
 import org.apache.streampipes.wrapper.standalone.StreamPipesDataSink;
 
 import okhttp3.OkHttpClient;
diff --git a/streampipes-extensions/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/streams/FlowRate2Stream.java b/streampipes-extensions/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/streams/FlowRate2Stream.java
index a351620f1..023fdc8e7 100644
--- a/streampipes-extensions/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/streams/FlowRate2Stream.java
+++ b/streampipes-extensions/streampipes-sources-watertank-simulator/src/main/java/org/apache/streampipes/sources/watertank/simulator/watertank/streams/FlowRate2Stream.java
@@ -90,5 +90,4 @@ public class FlowRate2Stream extends AbstractAlreadyExistingStream {
             "org.apache.streampipes.examples.flowrate2"))
         .build();
   }
-
 }
diff --git a/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/AbstractPipelineElementResource.java b/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/AbstractPipelineElementResource.java
index ef0d49077..20e24dbee 100644
--- a/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/AbstractPipelineElementResource.java
+++ b/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/AbstractPipelineElementResource.java
@@ -19,7 +19,7 @@
 package org.apache.streampipes.rest.extensions;
 
 import org.apache.streampipes.commons.constants.GlobalStreamPipesConstants;
-import org.apache.streampipes.extensions.api.declarer.Declarer;
+import org.apache.streampipes.extensions.api.pe.IStreamPipesPipelineElement;
 import org.apache.streampipes.extensions.management.assets.AssetZipGenerator;
 import org.apache.streampipes.extensions.management.init.DeclarersSingleton;
 import org.apache.streampipes.extensions.management.locales.LabelGenerator;
@@ -50,7 +50,9 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
-public abstract class AbstractPipelineElementResource<T extends Declarer<?>> extends AbstractExtensionsResource {
+public abstract class AbstractPipelineElementResource<
+    T extends IStreamPipesPipelineElement<?>>
+    extends AbstractExtensionsResource {
 
   private static final String SLASH = "/";
 
@@ -68,7 +70,7 @@ public abstract class AbstractPipelineElementResource<T extends Declarer<?>> ext
   @Path("{appId}/assets")
   @Produces(SpMediaType.APPLICATION_ZIP)
   public Response getAssets(@PathParam("appId") String appId) {
-    List<String> includedAssets = getDeclarerById(appId).declareModel().getIncludedAssets();
+    List<String> includedAssets = getDeclarerById(appId).declareConfig().getDescription().getIncludedAssets();
     try {
       return ok(new AssetZipGenerator(appId, includedAssets).makeZip());
     } catch (IOException e) {
@@ -116,8 +118,8 @@ public abstract class AbstractPipelineElementResource<T extends Declarer<?>> ext
   }
 
   protected NamedStreamPipesEntity getById(String appId) {
-    Declarer<?> declarer = getElementDeclarers().get(appId);
-    return declarer.declareModel();
+    IStreamPipesPipelineElement<?> declarer = getElementDeclarers().get(appId);
+    return declarer.declareConfig().getDescription();
   }
 
   protected NamedStreamPipesEntity rewrite(NamedStreamPipesEntity desc) {
diff --git a/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/html/page/WelcomePageGenerator.java b/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/html/page/WelcomePageGenerator.java
index 0bab6210b..052b61c60 100644
--- a/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/html/page/WelcomePageGenerator.java
+++ b/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/html/page/WelcomePageGenerator.java
@@ -18,12 +18,10 @@
 
 package org.apache.streampipes.rest.extensions.html.page;
 
-import org.apache.streampipes.extensions.api.declarer.DataStreamDeclarer;
-import org.apache.streampipes.extensions.api.declarer.Declarer;
-import org.apache.streampipes.extensions.api.declarer.InvocableDeclarer;
-import org.apache.streampipes.extensions.api.declarer.PipelineTemplateDeclarer;
-import org.apache.streampipes.extensions.api.declarer.SemanticEventConsumerDeclarer;
-import org.apache.streampipes.extensions.api.declarer.SemanticEventProcessingAgentDeclarer;
+import org.apache.streampipes.extensions.api.pe.IStreamPipesDataProcessor;
+import org.apache.streampipes.extensions.api.pe.IStreamPipesDataSink;
+import org.apache.streampipes.extensions.api.pe.IStreamPipesDataStream;
+import org.apache.streampipes.extensions.api.pe.IStreamPipesPipelineElement;
 import org.apache.streampipes.extensions.management.locales.LabelGenerator;
 import org.apache.streampipes.model.SpDataStream;
 import org.apache.streampipes.model.base.NamedStreamPipesEntity;
@@ -40,11 +38,12 @@ import java.util.List;
 public class WelcomePageGenerator {
 
   protected List<Description> descriptions;
-  protected Collection<Declarer<?>> declarers;
+  protected Collection<IStreamPipesPipelineElement<?>> pipelineElements;
   protected String baseUri;
 
-  public WelcomePageGenerator(String baseUri, Collection<Declarer<?>> declarers) {
-    this.declarers = declarers;
+  public WelcomePageGenerator(String baseUri,
+                              Collection<IStreamPipesPipelineElement<?>> pipelineElements) {
+    this.pipelineElements = pipelineElements;
     this.baseUri = baseUri;
     this.descriptions = new ArrayList<>();
   }
@@ -56,23 +55,17 @@ public class WelcomePageGenerator {
   public List<Description> buildUris() {
     List<Description> descriptions = new ArrayList<>();
 
-    for (Declarer<?> declarer : declarers) {
-      if (declarer instanceof InvocableDeclarer) {
-        descriptions.add(getDescription(declarer));
-      } else if (declarer instanceof DataStreamDeclarer) {
-        descriptions.add(getDescription(declarer));
-      } else if (declarer instanceof PipelineTemplateDeclarer) {
-        descriptions.add(getDescription(declarer));
-      }
+    for (IStreamPipesPipelineElement<?> pipelineElement : pipelineElements) {
+      descriptions.add(getDescription(pipelineElement));
     }
     return descriptions;
   }
 
-  private Description getDescription(Declarer<?> declarer) {
-    NamedStreamPipesEntity entity = declarer.declareModel();
+  private Description getDescription(IStreamPipesPipelineElement<?> declarer) {
+    NamedStreamPipesEntity entity = declarer.declareConfig().getDescription();
     Description desc = new Description();
     // TODO remove after full internationalization support has been implemented
-    updateLabel(declarer.declareModel(), desc);
+    updateLabel(entity, desc);
     desc.setType(getType(declarer));
     desc.setElementId(entity.getElementId());
     desc.setAppId(entity.getAppId());
@@ -82,25 +75,22 @@ public class WelcomePageGenerator {
     desc.setIncludesIcon(entity.isIncludesAssets()
         && entity.getIncludedAssets().contains(Assets.ICON));
     String uri = baseUri;
-    if (declarer instanceof SemanticEventConsumerDeclarer) {
+    if (declarer instanceof IStreamPipesDataSink) {
       uri += "sec/";
-    } else if (declarer instanceof SemanticEventProcessingAgentDeclarer) {
+    } else if (declarer instanceof IStreamPipesDataProcessor) {
       uri += "sepa/";
-    } else if (declarer instanceof DataStreamDeclarer) {
+    } else if (declarer instanceof IStreamPipesDataStream) {
       uri += "stream/";
-    } else if (declarer instanceof PipelineTemplateDeclarer) {
-      uri += "template/";
     }
-    desc.setDescriptionUrl(uri + declarer.declareModel().getAppId());
-    //desc.setUri(URI.create(uri + declarer.declareModel().getUri()
-    // .replaceFirst("[a-zA-Z]{4}://[a-zA-Z\\.]+:\\d+/", "")));
+    desc.setDescriptionUrl(uri + entity.getAppId());
     return desc;
   }
 
-  private String getType(Declarer<?> declarer) {
-    if (declarer.declareModel() instanceof DataSinkDescription) {
+  private String getType(IStreamPipesPipelineElement<?> pipelineElement) {
+    var elementDescription = pipelineElement.declareConfig().getDescription();
+    if (elementDescription instanceof DataSinkDescription) {
       return "action";
-    } else if (declarer.declareModel() instanceof SpDataStream) {
+    } else if (elementDescription instanceof SpDataStream) {
       return "stream";
     } else {
       return "sepa";
diff --git a/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/pe/DataProcessorPipelineElementResource.java b/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/pe/DataProcessorPipelineElementResource.java
index 4bff4a84e..15c953af7 100644
--- a/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/pe/DataProcessorPipelineElementResource.java
+++ b/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/pe/DataProcessorPipelineElementResource.java
@@ -19,9 +19,12 @@
 package org.apache.streampipes.rest.extensions.pe;
 
 import org.apache.streampipes.commons.constants.InstanceIdExtractor;
-import org.apache.streampipes.extensions.api.declarer.SemanticEventProcessingAgentDeclarer;
+import org.apache.streampipes.extensions.api.pe.IStreamPipesDataProcessor;
+import org.apache.streampipes.extensions.api.pe.runtime.IDataProcessorRuntime;
 import org.apache.streampipes.extensions.management.init.DeclarersSingleton;
+import org.apache.streampipes.extensions.management.init.RunningInstances;
 import org.apache.streampipes.extensions.management.util.GroundingDebugUtils;
+import org.apache.streampipes.model.Response;
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
 import org.apache.streampipes.sdk.extractor.ProcessingElementParameterExtractor;
 import org.apache.streampipes.svcdiscovery.api.model.SpServicePathPrefix;
@@ -32,7 +35,7 @@ import java.util.Map;
 
 @Path(SpServicePathPrefix.DATA_PROCESSOR)
 public class DataProcessorPipelineElementResource extends InvocablePipelineElementResource<DataProcessorInvocation,
-    SemanticEventProcessingAgentDeclarer, ProcessingElementParameterExtractor> {
+    IStreamPipesDataProcessor, IDataProcessorRuntime, ProcessingElementParameterExtractor> {
 
   public DataProcessorPipelineElementResource() {
 
@@ -40,8 +43,8 @@ public class DataProcessorPipelineElementResource extends InvocablePipelineEleme
   }
 
   @Override
-  protected Map<String, SemanticEventProcessingAgentDeclarer> getElementDeclarers() {
-    return DeclarersSingleton.getInstance().getEpaDeclarers();
+  protected Map<String, IStreamPipesDataProcessor> getElementDeclarers() {
+    return DeclarersSingleton.getInstance().getDataProcessors();
   }
 
   @Override
@@ -63,4 +66,20 @@ public class DataProcessorPipelineElementResource extends InvocablePipelineEleme
     GroundingDebugUtils.modifyGrounding(graph.getOutputStream().getEventGrounding());
     return graph;
   }
+
+  @Override
+  protected IDataProcessorRuntime getRuntime() {
+    return DeclarersSingleton.getInstance().getRuntimeProviders().get(0).getDataProcessorRuntime().get();
+  }
+
+  @Override
+  protected Response invokeRuntime(String runningInstanceId,
+                                   IStreamPipesDataProcessor pipelineElement,
+                                   DataProcessorInvocation graph) {
+    var runtime = getRuntime();
+    var response = runtime.onRuntimeInvoked(runningInstanceId, pipelineElement, graph);
+    RunningInstances.INSTANCE.add(runningInstanceId, graph, runtime);
+    return response;
+  }
+
 }
diff --git a/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/pe/DataSinkPipelineElementResource.java b/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/pe/DataSinkPipelineElementResource.java
index 6b8c08fb0..c48293d01 100644
--- a/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/pe/DataSinkPipelineElementResource.java
+++ b/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/pe/DataSinkPipelineElementResource.java
@@ -19,9 +19,12 @@
 package org.apache.streampipes.rest.extensions.pe;
 
 import org.apache.streampipes.commons.constants.InstanceIdExtractor;
-import org.apache.streampipes.extensions.api.declarer.SemanticEventConsumerDeclarer;
+import org.apache.streampipes.extensions.api.pe.IStreamPipesDataSink;
+import org.apache.streampipes.extensions.api.pe.runtime.IDataSinkRuntime;
 import org.apache.streampipes.extensions.management.init.DeclarersSingleton;
+import org.apache.streampipes.extensions.management.init.RunningInstances;
 import org.apache.streampipes.extensions.management.util.GroundingDebugUtils;
+import org.apache.streampipes.model.Response;
 import org.apache.streampipes.model.graph.DataSinkInvocation;
 import org.apache.streampipes.sdk.extractor.DataSinkParameterExtractor;
 import org.apache.streampipes.svcdiscovery.api.model.SpServicePathPrefix;
@@ -32,15 +35,15 @@ import java.util.Map;
 
 @Path(SpServicePathPrefix.DATA_SINK)
 public class DataSinkPipelineElementResource extends InvocablePipelineElementResource<DataSinkInvocation,
-    SemanticEventConsumerDeclarer, DataSinkParameterExtractor> {
+    IStreamPipesDataSink, IDataSinkRuntime, DataSinkParameterExtractor> {
 
   public DataSinkPipelineElementResource() {
     super(DataSinkInvocation.class);
   }
 
   @Override
-  protected Map<String, SemanticEventConsumerDeclarer> getElementDeclarers() {
-    return DeclarersSingleton.getInstance().getConsumerDeclarers();
+  protected Map<String, IStreamPipesDataSink> getElementDeclarers() {
+    return DeclarersSingleton.getInstance().getDataSinks();
   }
 
   @Override
@@ -62,4 +65,19 @@ public class DataSinkPipelineElementResource extends InvocablePipelineElementRes
 
     return graph;
   }
+
+  @Override
+  protected IDataSinkRuntime getRuntime() {
+    return DeclarersSingleton.getInstance().getRuntimeProviders().get(0).getDataSinkRuntime().get();
+  }
+
+  @Override
+  protected Response invokeRuntime(String runningInstanceId,
+                                   IStreamPipesDataSink pipelineElement,
+                                   DataSinkInvocation graph) {
+    var runtime = getRuntime();
+    var response = runtime.onRuntimeInvoked(runningInstanceId, pipelineElement, graph);
+    RunningInstances.INSTANCE.add(runningInstanceId, graph, runtime);
+    return response;
+  }
 }
diff --git a/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/pe/DataStreamPipelineElementResource.java b/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/pe/DataStreamPipelineElementResource.java
index 23d549982..5993ee715 100644
--- a/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/pe/DataStreamPipelineElementResource.java
+++ b/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/pe/DataStreamPipelineElementResource.java
@@ -18,7 +18,7 @@
 
 package org.apache.streampipes.rest.extensions.pe;
 
-import org.apache.streampipes.extensions.api.declarer.DataStreamDeclarer;
+import org.apache.streampipes.extensions.api.pe.IStreamPipesDataStream;
 import org.apache.streampipes.extensions.management.assets.AssetZipGenerator;
 import org.apache.streampipes.extensions.management.init.DeclarersSingleton;
 import org.apache.streampipes.rest.extensions.AbstractPipelineElementResource;
@@ -33,11 +33,11 @@ import java.io.IOException;
 import java.util.Map;
 
 @Path(SpServicePathPrefix.DATA_STREAM)
-public class DataStreamPipelineElementResource extends AbstractPipelineElementResource<DataStreamDeclarer> {
+public class DataStreamPipelineElementResource extends AbstractPipelineElementResource<IStreamPipesDataStream> {
 
   @Override
-  protected Map<String, DataStreamDeclarer> getElementDeclarers() {
-    return DeclarersSingleton.getInstance().getStreamDeclarers();
+  protected Map<String, IStreamPipesDataStream> getElementDeclarers() {
+    return DeclarersSingleton.getInstance().getDataStreams();
   }
 
   @GET
diff --git a/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/pe/InvocablePipelineElementResource.java b/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/pe/InvocablePipelineElementResource.java
index 37633c631..59b3c314d 100644
--- a/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/pe/InvocablePipelineElementResource.java
+++ b/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/pe/InvocablePipelineElementResource.java
@@ -21,8 +21,8 @@ package org.apache.streampipes.rest.extensions.pe;
 import org.apache.streampipes.commons.environment.Environments;
 import org.apache.streampipes.commons.exceptions.SpConfigurationException;
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
-import org.apache.streampipes.extensions.api.declarer.Declarer;
-import org.apache.streampipes.extensions.api.declarer.InvocableDeclarer;
+import org.apache.streampipes.extensions.api.pe.IStreamPipesPipelineElement;
+import org.apache.streampipes.extensions.api.pe.runtime.IStreamPipesRuntime;
 import org.apache.streampipes.extensions.api.runtime.ResolvesContainerProvidedOptions;
 import org.apache.streampipes.extensions.api.runtime.ResolvesContainerProvidedOutputStrategy;
 import org.apache.streampipes.extensions.api.runtime.SupportsRuntimeConfig;
@@ -51,7 +51,10 @@ import jakarta.ws.rs.core.MediaType;
 
 import java.util.Map;
 
-public abstract class InvocablePipelineElementResource<K extends InvocableStreamPipesEntity, T extends Declarer<?>,
+public abstract class InvocablePipelineElementResource<
+    K extends InvocableStreamPipesEntity,
+    T extends IStreamPipesPipelineElement<?>,
+    V extends IStreamPipesRuntime<T, K>,
     W extends AbstractParameterExtractor<K>> extends AbstractPipelineElementResource<T> {
 
   private static final Logger LOG = LoggerFactory.getLogger(InvocablePipelineElementResource.class);
@@ -73,38 +76,31 @@ public abstract class InvocablePipelineElementResource<K extends InvocableStream
   public jakarta.ws.rs.core.Response invokeRuntime(@PathParam("elementId") String elementId,
                                                  K graph) {
 
-    try {
-      if (isDebug()) {
-        LOG.info("SP_DEBUG env variable is set - overriding broker hostname and port for local development");
-        graph = createGroundingDebugInformation(graph);
-      }
+    if (isDebug()) {
+      LOG.info("SP_DEBUG env variable is set - overriding broker hostname and port for local development");
+      graph = createGroundingDebugInformation(graph);
+    }
 
-      InvocableDeclarer declarer = (InvocableDeclarer) getDeclarerById(elementId);
-
-      if (declarer != null) {
-        String runningInstanceId = getInstanceId(graph.getElementId(), elementId);
-        if (!RunningInstances.INSTANCE.exists(runningInstanceId)) {
-          RunningInstances.INSTANCE.add(runningInstanceId, graph, declarer.getClass().newInstance());
-          Response resp =
-              RunningInstances.INSTANCE.getInvocation(runningInstanceId).invokeRuntime(graph, getServiceGroup());
-          if (!resp.isSuccess()) {
-            LOG.error("Could not invoke pipeline element {} due to the following error: {}",
-                graph.getName(),
-                resp.getOptionalMessage());
-            RunningInstances.INSTANCE.remove(runningInstanceId);
-          }
-          return ok(resp);
-        } else {
-          LOG.info("Pipeline element {} with id {} seems to be already running, skipping invocation request.",
-              graph.getName(), runningInstanceId);
-          Response resp = new Response(graph.getElementId(), true);
-          return ok(resp);
-        }
+    T declarer = getDeclarerById(elementId);
 
+    if (declarer != null) {
+      String runningInstanceId = getInstanceId(graph.getElementId(), elementId);
+      if (!RunningInstances.INSTANCE.exists(runningInstanceId)) {
+        Response resp = invokeRuntime(runningInstanceId, declarer, graph);
+        if (!resp.isSuccess()) {
+          LOG.error("Could not invoke pipeline element {} due to the following error: {}",
+              graph.getName(),
+              resp.getOptionalMessage());
+          RunningInstances.INSTANCE.remove(runningInstanceId);
+        }
+        return ok(resp);
+      } else {
+        LOG.info("Pipeline element {} with id {} seems to be already running, skipping invocation request.",
+            graph.getName(), runningInstanceId);
+        Response resp = new Response(graph.getElementId(), true);
+        return ok(resp);
       }
-    } catch (InstantiationException | IllegalAccessException e) {
-      e.printStackTrace();
-      return ok(new Response(elementId, false, e.getMessage()));
+
     }
 
     return ok(new Response(elementId, false, "Could not find the element with id: " + elementId));
@@ -170,10 +166,10 @@ public abstract class InvocablePipelineElementResource<K extends InvocableStream
   public jakarta.ws.rs.core.Response detach(@PathParam("elementId") String elementId,
                                           @PathParam("runningInstanceId") String runningInstanceId) {
 
-    InvocableDeclarer runningInstance = RunningInstances.INSTANCE.getInvocation(runningInstanceId);
+    IStreamPipesRuntime<?, ?> runningInstance = RunningInstances.INSTANCE.getInvocation(runningInstanceId);
 
     if (runningInstance != null) {
-      Response resp = runningInstance.detachRuntime(runningInstanceId, getServiceGroup());
+      Response resp = runningInstance.onRuntimeDetached(runningInstanceId);
 
       if (resp.isSuccess()) {
         RunningInstances.INSTANCE.remove(runningInstanceId);
@@ -196,6 +192,12 @@ public abstract class InvocablePipelineElementResource<K extends InvocableStream
 
   protected abstract K createGroundingDebugInformation(K graph);
 
+  protected abstract V getRuntime();
+
+  protected abstract Response invokeRuntime(String instanceId,
+                                            T pipelineElement,
+                                            K graph);
+
   private Boolean isDebug() {
     return Environments.getEnvironment().getSpDebug().getValueOrDefault();
   }
diff --git a/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/pe/PipelineTemplateResource.java b/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/pe/PipelineTemplateResource.java
deleted file mode 100644
index 79c78e963..000000000
--- a/streampipes-rest-extensions/src/main/java/org/apache/streampipes/rest/extensions/pe/PipelineTemplateResource.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.streampipes.rest.extensions.pe;
-
-import org.apache.streampipes.extensions.api.declarer.PipelineTemplateDeclarer;
-import org.apache.streampipes.extensions.management.init.DeclarersSingleton;
-import org.apache.streampipes.rest.extensions.AbstractPipelineElementResource;
-
-import jakarta.ws.rs.Path;
-
-import java.util.Map;
-
-@Path("/template")
-public class PipelineTemplateResource extends AbstractPipelineElementResource<PipelineTemplateDeclarer> {
-
-  @Override
-  protected Map<String, PipelineTemplateDeclarer> getElementDeclarers() {
-    return DeclarersSingleton.getInstance().getPipelineTemplateDeclarers();
-  }
-}
diff --git a/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/builder/processor/DataProcessorConfiguration.java b/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/builder/processor/DataProcessorConfiguration.java
new file mode 100644
index 000000000..cd8e5d24b
--- /dev/null
+++ b/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/builder/processor/DataProcessorConfiguration.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.streampipes.sdk.builder.processor;
+
+import org.apache.streampipes.extensions.api.pe.IStreamPipesDataProcessor;
+import org.apache.streampipes.extensions.api.pe.config.IDataProcessorConfiguration;
+import org.apache.streampipes.model.graph.DataProcessorDescription;
+
+import java.util.function.Supplier;
+
+public class DataProcessorConfiguration implements IDataProcessorConfiguration {
+
+  private final Supplier<IStreamPipesDataProcessor> supplier;
+  private final DataProcessorDescription dataProcessorDescription;
+
+  public static DataProcessorConfiguration create(Supplier<IStreamPipesDataProcessor> supplier,
+                                                  DataProcessorDescription dataProcessorDescription) {
+    return new DataProcessorConfiguration(supplier, dataProcessorDescription);
+  }
+
+  private DataProcessorConfiguration(Supplier<IStreamPipesDataProcessor> supplier,
+                                    DataProcessorDescription dataProcessorDescription) {
+    this.supplier = supplier;
+    this.dataProcessorDescription = dataProcessorDescription;
+  }
+
+  @Override
+  public DataProcessorDescription getDescription() {
+    return dataProcessorDescription;
+  }
+
+  @Override
+  public Supplier<IStreamPipesDataProcessor> getSupplier() {
+    return supplier;
+  }
+}
diff --git a/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/builder/sink/DataSinkConfiguration.java b/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/builder/sink/DataSinkConfiguration.java
new file mode 100644
index 000000000..ae9c3beeb
--- /dev/null
+++ b/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/builder/sink/DataSinkConfiguration.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.streampipes.sdk.builder.sink;
+
+import org.apache.streampipes.extensions.api.pe.IStreamPipesDataSink;
+import org.apache.streampipes.extensions.api.pe.config.IDataSinkConfiguration;
+import org.apache.streampipes.model.graph.DataSinkDescription;
+
+import java.util.function.Supplier;
+
+public class DataSinkConfiguration implements IDataSinkConfiguration {
+
+  private final Supplier<IStreamPipesDataSink> supplier;
+  private final DataSinkDescription dataSinkDescription;
+
+  public static DataSinkConfiguration create(Supplier<IStreamPipesDataSink> supplier,
+                                             DataSinkDescription dataSinkDescription) {
+    return new DataSinkConfiguration(supplier, dataSinkDescription);
+  }
+
+  private DataSinkConfiguration(Supplier<IStreamPipesDataSink> supplier,
+                               DataSinkDescription dataSinkDescription) {
+    this.supplier = supplier;
+    this.dataSinkDescription = dataSinkDescription;
+  }
+
+  @Override
+  public DataSinkDescription getDescription() {
+    return dataSinkDescription;
+  }
+
+  @Override
+  public Supplier<IStreamPipesDataSink> getSupplier() {
+    return supplier;
+  }
+}
diff --git a/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/builder/stream/DataStreamConfiguration.java b/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/builder/stream/DataStreamConfiguration.java
new file mode 100644
index 000000000..5b42770fa
--- /dev/null
+++ b/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/builder/stream/DataStreamConfiguration.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.streampipes.sdk.builder.stream;
+
+import org.apache.streampipes.extensions.api.pe.IStreamPipesDataStream;
+import org.apache.streampipes.extensions.api.pe.config.IDataStreamConfiguration;
+import org.apache.streampipes.model.SpDataStream;
+
+import java.util.function.Supplier;
+
+public class DataStreamConfiguration implements IDataStreamConfiguration {
+
+  private final Supplier<IStreamPipesDataStream> supplier;
+  private final SpDataStream dataStream;
+
+  public static DataStreamConfiguration create(Supplier<IStreamPipesDataStream> supplier,
+                                               SpDataStream dataStream) {
+    return new DataStreamConfiguration(supplier, dataStream);
+  }
+
+  public DataStreamConfiguration(Supplier<IStreamPipesDataStream> supplier,
+                                 SpDataStream dataStream) {
+    this.supplier = supplier;
+    this.dataStream = dataStream;
+  }
+
+  @Override
+  public SpDataStream getDescription() {
+    return dataStream;
+  }
+
+  @Override
+  public Supplier<IStreamPipesDataStream> getSupplier() {
+    return supplier;
+  }
+}
diff --git a/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/extractor/DataSinkParameterExtractor.java b/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/extractor/DataSinkParameterExtractor.java
index 5624aaea4..686b22507 100644
--- a/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/extractor/DataSinkParameterExtractor.java
+++ b/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/extractor/DataSinkParameterExtractor.java
@@ -18,15 +18,18 @@
 
 package org.apache.streampipes.sdk.extractor;
 
+import org.apache.streampipes.extensions.api.extractor.IDataSinkParameterExtractor;
 import org.apache.streampipes.model.graph.DataSinkInvocation;
 
-public class DataSinkParameterExtractor extends AbstractParameterExtractor<DataSinkInvocation> {
+public class DataSinkParameterExtractor
+    extends AbstractParameterExtractor<DataSinkInvocation>
+    implements IDataSinkParameterExtractor {
 
   public DataSinkParameterExtractor(DataSinkInvocation pipelineElement) {
     super(pipelineElement);
   }
 
-  public static DataSinkParameterExtractor from(DataSinkInvocation pipelineElement) {
+  public static IDataSinkParameterExtractor from(DataSinkInvocation pipelineElement) {
     return new DataSinkParameterExtractor(pipelineElement);
   }
 }
diff --git a/streampipes-service-extensions/src/main/java/org/apache/streampipes/service/extensions/ExtensionsResourceConfig.java b/streampipes-service-extensions/src/main/java/org/apache/streampipes/service/extensions/ExtensionsResourceConfig.java
index beaba5392..005dd4ca5 100644
--- a/streampipes-service-extensions/src/main/java/org/apache/streampipes/service/extensions/ExtensionsResourceConfig.java
+++ b/streampipes-service-extensions/src/main/java/org/apache/streampipes/service/extensions/ExtensionsResourceConfig.java
@@ -28,7 +28,6 @@ import org.apache.streampipes.rest.extensions.monitoring.MonitoringResource;
 import org.apache.streampipes.rest.extensions.pe.DataProcessorPipelineElementResource;
 import org.apache.streampipes.rest.extensions.pe.DataSinkPipelineElementResource;
 import org.apache.streampipes.rest.extensions.pe.DataStreamPipelineElementResource;
-import org.apache.streampipes.rest.extensions.pe.PipelineTemplateResource;
 import org.apache.streampipes.rest.shared.serializer.JacksonSerializationProvider;
 import org.apache.streampipes.service.base.rest.BaseResourceConfig;
 import org.apache.streampipes.service.base.rest.ServiceHealthResource;
@@ -57,7 +56,6 @@ public class ExtensionsResourceConfig extends BaseResourceConfig {
         DataProcessorPipelineElementResource.class,
         DataStreamPipelineElementResource.class,
         WelcomePage.class,
-        PipelineTemplateResource.class,
 
         ServiceHealthResource.class,
         JacksonSerializationProvider.class,
diff --git a/streampipes-service-extensions/src/main/java/org/apache/streampipes/service/extensions/ServiceTagProvider.java b/streampipes-service-extensions/src/main/java/org/apache/streampipes/service/extensions/ServiceTagProvider.java
index bd9569aca..30e13b8a9 100644
--- a/streampipes-service-extensions/src/main/java/org/apache/streampipes/service/extensions/ServiceTagProvider.java
+++ b/streampipes-service-extensions/src/main/java/org/apache/streampipes/service/extensions/ServiceTagProvider.java
@@ -19,7 +19,7 @@
 package org.apache.streampipes.service.extensions;
 
 import org.apache.streampipes.extensions.api.connect.StreamPipesAdapter;
-import org.apache.streampipes.extensions.api.declarer.Declarer;
+import org.apache.streampipes.extensions.api.pe.IStreamPipesPipelineElement;
 import org.apache.streampipes.extensions.management.init.DeclarersSingleton;
 import org.apache.streampipes.extensions.management.util.ServiceDefinitionUtil;
 import org.apache.streampipes.svcdiscovery.api.model.DefaultSpServiceTags;
@@ -40,7 +40,8 @@ public class ServiceTagProvider {
   }
 
   private List<SpServiceTag> extractPipelineElementServiceTags() {
-    Collection<Declarer<?>> declarers = DeclarersSingleton.getInstance().getDeclarers().values();
+    Collection<IStreamPipesPipelineElement<?>> declarers =
+        DeclarersSingleton.getInstance().getDeclarers().values();
     List<SpServiceTag> serviceTags = ServiceDefinitionUtil.extractAppIds(declarers);
     serviceTags.add(DefaultSpServiceTags.PE);
 
diff --git a/streampipes-service-extensions/src/main/java/org/apache/streampipes/service/extensions/function/StreamPipesFunctionHandler.java b/streampipes-service-extensions/src/main/java/org/apache/streampipes/service/extensions/function/StreamPipesFunctionHandler.java
index ea1897838..aeda204da 100644
--- a/streampipes-service-extensions/src/main/java/org/apache/streampipes/service/extensions/function/StreamPipesFunctionHandler.java
+++ b/streampipes-service-extensions/src/main/java/org/apache/streampipes/service/extensions/function/StreamPipesFunctionHandler.java
@@ -18,12 +18,13 @@
 
 package org.apache.streampipes.service.extensions.function;
 
-import org.apache.streampipes.extensions.api.declarer.DataStreamDeclarer;
 import org.apache.streampipes.extensions.api.declarer.IStreamPipesFunctionDeclarer;
+import org.apache.streampipes.extensions.api.pe.IStreamPipesDataStream;
+import org.apache.streampipes.extensions.api.pe.config.IDataStreamConfiguration;
 import org.apache.streampipes.extensions.management.client.StreamPipesClientResolver;
 import org.apache.streampipes.extensions.management.init.DeclarersSingleton;
-import org.apache.streampipes.model.SpDataStream;
 import org.apache.streampipes.model.function.FunctionDefinition;
+import org.apache.streampipes.sdk.builder.stream.DataStreamConfiguration;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -61,10 +62,13 @@ public enum StreamPipesFunctionHandler {
     var client = new StreamPipesClientResolver().makeStreamPipesClientInstance();
     functions.forEach(function -> {
       function.getFunctionConfig().getOutputDataStreams().values().forEach(ds -> {
-        DeclarersSingleton.getInstance().add(new DataStreamDeclarer() {
+        DeclarersSingleton.getInstance().add(new IStreamPipesDataStream() {
           @Override
-          public SpDataStream declareModel() {
-            return ds;
+          public IDataStreamConfiguration declareConfig() {
+            return DataStreamConfiguration.create(
+                () -> this,
+                ds
+            );
           }
 
           @Override
diff --git a/streampipes-sources/src/main/java/org/apache/streampipes/sources/AbstractAdapterIncludedStream.java b/streampipes-sources/src/main/java/org/apache/streampipes/sources/AbstractAdapterIncludedStream.java
index cb4560520..7f31edcda 100644
--- a/streampipes-sources/src/main/java/org/apache/streampipes/sources/AbstractAdapterIncludedStream.java
+++ b/streampipes-sources/src/main/java/org/apache/streampipes/sources/AbstractAdapterIncludedStream.java
@@ -18,11 +18,14 @@
 
 package org.apache.streampipes.sources;
 
-import org.apache.streampipes.extensions.api.declarer.DataStreamDeclarer;
+import org.apache.streampipes.extensions.api.pe.IStreamPipesDataStream;
+import org.apache.streampipes.extensions.api.pe.config.IDataStreamConfiguration;
 import org.apache.streampipes.extensions.management.config.ConfigExtractor;
 import org.apache.streampipes.extensions.management.init.DeclarersSingleton;
+import org.apache.streampipes.model.SpDataStream;
+import org.apache.streampipes.sdk.builder.stream.DataStreamConfiguration;
 
-public abstract class AbstractAdapterIncludedStream implements DataStreamDeclarer {
+public abstract class AbstractAdapterIncludedStream implements IStreamPipesDataStream {
 
   @Override
   public boolean isExecutable() {
@@ -32,4 +35,14 @@ public abstract class AbstractAdapterIncludedStream implements DataStreamDeclare
   public ConfigExtractor configExtractor() {
     return ConfigExtractor.from(DeclarersSingleton.getInstance().getServiceDefinition().getServiceGroup());
   }
+
+  @Override
+  public IDataStreamConfiguration declareConfig() {
+    return DataStreamConfiguration.create(
+        () -> this,
+        declareModel()
+    );
+  }
+
+  public abstract SpDataStream declareModel();
 }
diff --git a/streampipes-sources/src/main/java/org/apache/streampipes/sources/AbstractAlreadyExistingStream.java b/streampipes-sources/src/main/java/org/apache/streampipes/sources/AbstractAlreadyExistingStream.java
index 7ccf668bd..42eb4705b 100644
--- a/streampipes-sources/src/main/java/org/apache/streampipes/sources/AbstractAlreadyExistingStream.java
+++ b/streampipes-sources/src/main/java/org/apache/streampipes/sources/AbstractAlreadyExistingStream.java
@@ -19,23 +19,36 @@
 package org.apache.streampipes.sources;
 
 
-import org.apache.streampipes.extensions.api.declarer.DataStreamDeclarer;
+import org.apache.streampipes.extensions.api.pe.IStreamPipesDataStream;
+import org.apache.streampipes.extensions.api.pe.config.IDataStreamConfiguration;
 import org.apache.streampipes.extensions.management.config.ConfigExtractor;
 import org.apache.streampipes.extensions.management.init.DeclarersSingleton;
+import org.apache.streampipes.model.SpDataStream;
+import org.apache.streampipes.sdk.builder.stream.DataStreamConfiguration;
 
-public abstract class AbstractAlreadyExistingStream implements DataStreamDeclarer {
+public abstract class AbstractAlreadyExistingStream implements IStreamPipesDataStream {
 
   @Override
-  public void executeStream() {
-
+  public boolean isExecutable() {
+    return false;
   }
 
   @Override
-  public boolean isExecutable() {
-    return false;
+  public void executeStream() {
+
   }
 
   public ConfigExtractor configExtractor() {
     return ConfigExtractor.from(DeclarersSingleton.getInstance().getServiceDefinition().getServiceGroup());
   }
+
+  @Override
+  public IDataStreamConfiguration declareConfig() {
+    return DataStreamConfiguration.create(
+        () -> this,
+        declareModel()
+    );
+  }
+
+  public abstract SpDataStream declareModel();
 }
diff --git a/streampipes-wrapper-distributed/src/main/java/org/apache/streampipes/wrapper/distributed/runtime/DistributedRuntime.java b/streampipes-wrapper-distributed/src/main/java/org/apache/streampipes/wrapper/distributed/runtime/DistributedRuntime.java
index d9edf03dd..d24e9a65a 100644
--- a/streampipes-wrapper-distributed/src/main/java/org/apache/streampipes/wrapper/distributed/runtime/DistributedRuntime.java
+++ b/streampipes-wrapper-distributed/src/main/java/org/apache/streampipes/wrapper/distributed/runtime/DistributedRuntime.java
@@ -17,10 +17,15 @@
  */
 package org.apache.streampipes.wrapper.distributed.runtime;
 
-import org.apache.streampipes.client.StreamPipesClient;
 import org.apache.streampipes.dataformat.SpDataFormatDefinition;
 import org.apache.streampipes.dataformat.SpDataFormatManager;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
+import org.apache.streampipes.extensions.api.extractor.IParameterExtractor;
+import org.apache.streampipes.extensions.api.pe.IStreamPipesPipelineElement;
+import org.apache.streampipes.extensions.api.pe.context.IContextGenerator;
+import org.apache.streampipes.extensions.api.pe.context.RuntimeContext;
+import org.apache.streampipes.extensions.api.pe.param.IParameterGenerator;
+import org.apache.streampipes.extensions.api.pe.param.IPipelineElementParameters;
+import org.apache.streampipes.extensions.api.pe.runtime.IStreamPipesRuntime;
 import org.apache.streampipes.messaging.kafka.config.ConsumerConfigFactory;
 import org.apache.streampipes.messaging.kafka.config.ProducerConfigFactory;
 import org.apache.streampipes.model.SpDataStream;
@@ -30,41 +35,22 @@ import org.apache.streampipes.model.grounding.KafkaTransportProtocol;
 import org.apache.streampipes.model.grounding.MqttTransportProtocol;
 import org.apache.streampipes.model.grounding.TransportFormat;
 import org.apache.streampipes.model.grounding.TransportProtocol;
-import org.apache.streampipes.wrapper.context.RuntimeContext;
-import org.apache.streampipes.wrapper.params.binding.BindingParams;
-import org.apache.streampipes.wrapper.params.runtime.RuntimeParams;
 import org.apache.streampipes.wrapper.runtime.PipelineElementRuntime;
 
 import java.util.Properties;
 
-public abstract class DistributedRuntime<RpT extends RuntimeParams<V, W, X>, V extends
-    BindingParams<W>, W extends InvocableStreamPipesEntity, X extends RuntimeContext> extends
-    PipelineElementRuntime {
-
-  protected RpT runtimeParams;
-  protected V bindingParams;
-
-  @Deprecated
-  protected V params;
-
-  public DistributedRuntime(RpT runtimeParams) {
-    super();
-    this.runtimeParams = runtimeParams;
-    this.bindingParams = runtimeParams.getBindingParams();
-    this.params = runtimeParams.getBindingParams();
-  }
-
-  public DistributedRuntime(V bindingParams,
-                            ConfigExtractor configExtractor,
-                            StreamPipesClient streamPipesClient) {
-    super();
-    this.bindingParams = bindingParams;
-    this.params = bindingParams;
-    this.runtimeParams = makeRuntimeParams(configExtractor, streamPipesClient);
-  }
-
-  protected W getGraph() {
-    return runtimeParams.getBindingParams().getGraph();
+public abstract class DistributedRuntime<
+    PeT extends IStreamPipesPipelineElement<?>,
+    IvT extends InvocableStreamPipesEntity,
+    RcT extends RuntimeContext,
+    ExT extends IParameterExtractor<IvT>,
+    PepT extends IPipelineElementParameters<IvT, ExT>>
+    extends PipelineElementRuntime<PeT, IvT, RcT, ExT, PepT>
+    implements IStreamPipesRuntime<PeT, IvT> {
+
+  public DistributedRuntime(IContextGenerator<RcT, IvT> contextGenerator,
+                             IParameterGenerator<IvT, ExT, PepT> parameterGenerator) {
+    super(contextGenerator, parameterGenerator);
   }
 
   protected Properties getProperties(KafkaTransportProtocol protocol) {
@@ -123,7 +109,4 @@ public abstract class DistributedRuntime<RpT extends RuntimeParams<V, W, X>, V e
     return topic.replaceAll("\\*", ".*");
   }
 
-  protected abstract RpT makeRuntimeParams(ConfigExtractor configExtractor,
-                                           StreamPipesClient streamPipesClient);
-
 }
diff --git a/streampipes-wrapper-flink/pom.xml b/streampipes-wrapper-flink/pom.xml
index 3cb3cfa4f..070ceb096 100644
--- a/streampipes-wrapper-flink/pom.xml
+++ b/streampipes-wrapper-flink/pom.xml
@@ -50,7 +50,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-connector-kafka_2.11</artifactId>
+            <artifactId>flink-connector-kafka</artifactId>
             <version>${flink.version}</version>
         </dependency>
         <dependency>
@@ -70,7 +70,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-streaming-java_2.11</artifactId>
+            <artifactId>flink-streaming-java</artifactId>
             <version>${flink.version}</version>
             <exclusions>
                 <exclusion>
@@ -97,7 +97,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-clients_2.11</artifactId>
+            <artifactId>flink-clients</artifactId>
             <version>${flink.version}</version>
             <exclusions>
                 <exclusion>
@@ -110,6 +110,11 @@
             <groupId>org.xerial.snappy</groupId>
             <artifactId>snappy-java</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.esotericsoftware.kryo</groupId>
+            <artifactId>kryo</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
@@ -119,4 +124,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/FlinkDataProcessorCompatProgram.java b/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/FlinkDataProcessorCompatProgram.java
new file mode 100644
index 000000000..e978d52de
--- /dev/null
+++ b/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/FlinkDataProcessorCompatProgram.java
@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.streampipes.wrapper.flink;
+
+import org.apache.streampipes.commons.exceptions.SpRuntimeException;
+import org.apache.streampipes.extensions.api.pe.IStreamPipesDataProcessor;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
+import org.apache.streampipes.messaging.InternalEventProcessor;
+import org.apache.streampipes.model.runtime.Event;
+
+import org.apache.flink.api.common.functions.FlatMapFunction;
+import org.apache.flink.streaming.api.datastream.DataStream;
+import org.apache.flink.util.Collector;
+
+import java.util.Map;
+
+public class FlinkDataProcessorCompatProgram implements IDataProcessorProgram {
+
+  private IStreamPipesDataProcessor pipelineElement;
+
+  public FlinkDataProcessorCompatProgram(IStreamPipesDataProcessor pipelineElement) {
+    this.pipelineElement = pipelineElement;
+  }
+
+  @Override
+  public DataStream<Event> getApplicationLogic(DataStream<Event>... messageStream) {
+    return messageStream[0]
+        .flatMap(new FlatMapFunction<Event, Event>() {
+          @Override
+          public void flatMap(Event value, Collector<Event> out) throws Exception {
+            pipelineElement.onEvent(value, new SpOutputCollector() {
+              @Override
+              public void collect(Event event) {
+                out.collect(event);
+              }
+
+              @Override
+              public void registerConsumer(String routeId, InternalEventProcessor<Map<String, Object>> consumer) {
+
+              }
+
+              @Override
+              public void unregisterConsumer(String routeId) {
+
+              }
+
+              @Override
+              public void connect() throws SpRuntimeException {
+
+              }
+
+              @Override
+              public void disconnect() throws SpRuntimeException {
+
+              }
+            });
+          }
+        });
+  }
+}
diff --git a/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/FlinkDataProcessorDeclarer.java b/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/FlinkDataProcessorDeclarer.java
index d6bd199d2..a4e5c58bb 100644
--- a/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/FlinkDataProcessorDeclarer.java
+++ b/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/FlinkDataProcessorDeclarer.java
@@ -18,11 +18,49 @@
 
 package org.apache.streampipes.wrapper.flink;
 
-import org.apache.streampipes.wrapper.declarer.EventProcessorDeclarer;
-import org.apache.streampipes.wrapper.params.binding.EventProcessorBindingParams;
+import org.apache.streampipes.extensions.api.pe.IStreamPipesDataProcessor;
+import org.apache.streampipes.extensions.api.pe.config.IDataProcessorConfiguration;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.param.IDataProcessorParameters;
+import org.apache.streampipes.extensions.api.pe.routing.SpOutputCollector;
+import org.apache.streampipes.model.graph.DataProcessorDescription;
+import org.apache.streampipes.model.graph.DataProcessorInvocation;
+import org.apache.streampipes.model.runtime.Event;
+import org.apache.streampipes.sdk.builder.processor.DataProcessorConfiguration;
+import org.apache.streampipes.sdk.extractor.ProcessingElementParameterExtractor;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 
-public abstract class FlinkDataProcessorDeclarer<T extends EventProcessorBindingParams>
-    extends EventProcessorDeclarer<T, FlinkDataProcessorRuntime<T>> {
+public abstract class FlinkDataProcessorDeclarer<T extends ProcessorParams>
+    implements IStreamPipesDataProcessor {
 
 
+  @Override
+  public void onPipelineStarted(IDataProcessorParameters params,
+                                SpOutputCollector collector,
+                                EventProcessorRuntimeContext runtimeContext) {
+
+  }
+
+  @Override
+  public void onEvent(Event event, SpOutputCollector collector) {
+
+  }
+
+  @Override
+  public void onPipelineStopped() {
+
+  }
+
+  @Override
+  public IDataProcessorConfiguration declareConfig() {
+    return DataProcessorConfiguration.create(
+        () -> this,
+        declareModel()
+    );
+  }
+
+  public abstract FlinkDataProcessorProgram<T> getProgram(DataProcessorInvocation graph,
+                                                          ProcessingElementParameterExtractor extractor);
+
+  public abstract DataProcessorDescription declareModel();
 }
diff --git a/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/FlinkDataSinkDeclarer.java b/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/FlinkDataProcessorProgram.java
similarity index 75%
copy from streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/FlinkDataSinkDeclarer.java
copy to streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/FlinkDataProcessorProgram.java
index a9001b6a4..682d9c089 100644
--- a/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/FlinkDataSinkDeclarer.java
+++ b/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/FlinkDataProcessorProgram.java
@@ -18,10 +18,13 @@
 
 package org.apache.streampipes.wrapper.flink;
 
-import org.apache.streampipes.wrapper.declarer.EventSinkDeclarer;
-import org.apache.streampipes.wrapper.params.binding.EventSinkBindingParams;
+import org.apache.streampipes.wrapper.params.compat.ProcessorParams;
 
-public abstract class FlinkDataSinkDeclarer<T extends EventSinkBindingParams>
-    extends EventSinkDeclarer<T, FlinkDataSinkRuntime<T>> {
+public abstract class FlinkDataProcessorProgram<T extends ProcessorParams> implements IDataProcessorProgram {
 
+  protected T params;
+
+  public FlinkDataProcessorProgram(T params) {
+    this.params = params;
+  }
 }
diff --git a/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/FlinkDataProcessorRuntime.java b/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/FlinkDataProcessorRuntime.java
index 95926808e..27c8614df 100644
--- a/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/FlinkDataProcessorRuntime.java
+++ b/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/FlinkDataProcessorRuntime.java
@@ -18,49 +18,65 @@
 
 package org.apache.streampipes.wrapper.flink;
 
-import org.apache.streampipes.client.StreamPipesClient;
 import org.apache.streampipes.dataformat.SpDataFormatDefinition;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
+import org.apache.streampipes.extensions.api.extractor.IDataProcessorParameterExtractor;
+import org.apache.streampipes.extensions.api.pe.IStreamPipesDataProcessor;
+import org.apache.streampipes.extensions.api.pe.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.param.IDataProcessorParameters;
+import org.apache.streampipes.extensions.api.pe.runtime.IDataProcessorRuntime;
 import org.apache.streampipes.model.SpDataStream;
 import org.apache.streampipes.model.graph.DataProcessorInvocation;
 import org.apache.streampipes.model.grounding.EventGrounding;
 import org.apache.streampipes.model.grounding.KafkaTransportProtocol;
 import org.apache.streampipes.model.runtime.Event;
-import org.apache.streampipes.wrapper.context.EventProcessorRuntimeContext;
+import org.apache.streampipes.sdk.extractor.ProcessingElementParameterExtractor;
+import org.apache.streampipes.wrapper.context.generator.DataProcessorContextGenerator;
 import org.apache.streampipes.wrapper.flink.converter.EventToMapConverter;
 import org.apache.streampipes.wrapper.flink.serializer.ByteArraySerializer;
 import org.apache.streampipes.wrapper.flink.sink.JmsFlinkProducer;
 import org.apache.streampipes.wrapper.flink.sink.MqttFlinkProducer;
-import org.apache.streampipes.wrapper.params.binding.EventProcessorBindingParams;
-import org.apache.streampipes.wrapper.params.runtime.EventProcessorRuntimeParams;
+import org.apache.streampipes.wrapper.params.generator.DataProcessorParameterGenerator;
 
 import org.apache.flink.streaming.api.datastream.DataStream;
 import org.apache.flink.streaming.connectors.kafka.FlinkKafkaProducer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.Map;
 import java.util.Properties;
 import java.util.UUID;
 
-public abstract class FlinkDataProcessorRuntime<T extends EventProcessorBindingParams> extends
-    FlinkRuntime<EventProcessorRuntimeParams<T>, T,
-        DataProcessorInvocation, EventProcessorRuntimeContext> {
+public class FlinkDataProcessorRuntime extends FlinkRuntime<
+    IStreamPipesDataProcessor,
+    DataProcessorInvocation,
+    EventProcessorRuntimeContext,
+    IDataProcessorParameterExtractor,
+    IDataProcessorParameters,
+    IDataProcessorProgram> implements IDataProcessorRuntime {
 
-  private static final long serialVersionUID = 1L;
-  private static final Logger LOG = LoggerFactory.getLogger(FlinkDataProcessorRuntime.class);
+  public FlinkDataProcessorRuntime() {
+    super(new DataProcessorContextGenerator(), new DataProcessorParameterGenerator());
+  }
+
+  private SpDataStream getOutputStream() {
+    //return getGraph().getOutputStream();
+    return null;
+  }
+
+  protected Properties getProperties(KafkaTransportProtocol protocol) {
+    Properties props = new Properties();
 
+    String kafkaHost = protocol.getBrokerHostname();
+    int kafkaPort = protocol.getKafkaPort();
 
-  public FlinkDataProcessorRuntime(T params,
-                                   ConfigExtractor configExtractor,
-                                   StreamPipesClient streamPipesClient) {
-    super(params, configExtractor, streamPipesClient);
+    props.put("client.id", UUID.randomUUID().toString());
+    props.put("bootstrap.servers", kafkaHost + ":" + kafkaPort);
+    return props;
   }
 
-  @SuppressWarnings("deprecation")
-  public void appendExecutionConfig(DataStream<Event>... convertedStream) {
-    DataStream<Map<String, Object>> applicationLogic = getApplicationLogic(convertedStream).flatMap
-        (new EventToMapConverter());
+  @Override
+  protected void appendExecutionConfig(IDataProcessorProgram program,
+                                       DataStream<Event>... convertedStream) {
+    DataStream<Map<String, Object>> applicationLogic = program.getApplicationLogic(convertedStream)
+        .flatMap(new EventToMapConverter());
 
     EventGrounding outputGrounding = getOutputStream().getEventGrounding();
     SpDataFormatDefinition outputDataFormatDefinition =
@@ -80,31 +96,21 @@ public abstract class FlinkDataProcessorRuntime<T extends EventProcessorBindingP
       applicationLogic
           .addSink(new MqttFlinkProducer(getMqttProtocol(getOutputStream()), serializer));
     }
-
-  }
-
-  private SpDataStream getOutputStream() {
-    return getGraph().getOutputStream();
-  }
-
-  protected abstract DataStream<Event> getApplicationLogic(DataStream<Event>... messageStream);
-
-  protected Properties getProperties(KafkaTransportProtocol protocol) {
-    Properties props = new Properties();
-
-    String kafkaHost = protocol.getBrokerHostname();
-    Integer kafkaPort = protocol.getKafkaPort();
-
-    props.put("client.id", UUID.randomUUID().toString());
-    props.put("bootstrap.servers", kafkaHost + ":" + kafkaPort);
-    return props;
   }
 
   @Override
-  protected EventProcessorRuntimeParams<T> makeRuntimeParams(ConfigExtractor configExtractor,
-                                                             StreamPipesClient streamPipesClient) {
-    LOG.warn("The config extractor and StreamPipes Client can currently not be accessed by"
-        + " a deployed Flink program due to non-serializable classes.");
-    return new EventProcessorRuntimeParams<>(bindingParams, false, null, null);
+  protected IDataProcessorProgram getFlinkProgram(IStreamPipesDataProcessor pipelineElement) {
+    IDataProcessorProgram program;
+
+    if (pipelineElement instanceof FlinkDataProcessorDeclarer<?>) {
+      program = ((FlinkDataProcessorDeclarer<?>) pipelineElement)
+          .getProgram(
+              runtimeParameters.getModel(),
+              ProcessingElementParameterExtractor.from(runtimeParameters.getModel())
+          );
+    } else {
+      program = new FlinkDataProcessorCompatProgram(pipelineElement);
+    }
+    return program;
   }
 }
diff --git a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/hasher/algorithm/Sha1HashAlgorithm.java b/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/FlinkDataSinkCompatProgram.java
similarity index 60%
rename from streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/hasher/algorithm/Sha1HashAlgorithm.java
rename to streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/FlinkDataSinkCompatProgram.java
index 9e6de51da..4a038dcff 100644
--- a/streampipes-extensions/streampipes-processors-transformation-flink/src/main/java/org/apache/streampipes/processors/transformation/flink/processor/hasher/algorithm/Sha1HashAlgorithm.java
+++ b/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/FlinkDataSinkCompatProgram.java
@@ -16,17 +16,23 @@
  *
  */
 
-package org.apache.streampipes.processors.transformation.flink.processor.hasher.algorithm;
+package org.apache.streampipes.wrapper.flink;
 
-import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.streampipes.extensions.api.pe.IStreamPipesDataSink;
+import org.apache.streampipes.model.runtime.Event;
 
-public class Sha1HashAlgorithm implements HashAlgorithm {
+import org.apache.flink.streaming.api.datastream.DataStream;
 
-  private static final long serialVersionUID = 1L;
+public class FlinkDataSinkCompatProgram implements IDataSinkProgram {
 
-  @Override
-  public String toHashValue(Object value) {
-    return DigestUtils.shaHex(String.valueOf(value));
+  private IStreamPipesDataSink pipelineElement;
+
+  public FlinkDataSinkCompatProgram(IStreamPipesDataSink pipelineElement) {
+    this.pipelineElement = pipelineElement;
   }
 
+  @Override
+  public void getSink(DataStream<Event>... convertedStream1) {
+
+  }
 }
diff --git a/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/FlinkDataSinkDeclarer.java b/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/FlinkDataSinkDeclarer.java
index a9001b6a4..dba2defe3 100644
--- a/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/FlinkDataSinkDeclarer.java
+++ b/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/FlinkDataSinkDeclarer.java
@@ -18,10 +18,45 @@
 
 package org.apache.streampipes.wrapper.flink;
 
-import org.apache.streampipes.wrapper.declarer.EventSinkDeclarer;
-import org.apache.streampipes.wrapper.params.binding.EventSinkBindingParams;
+import org.apache.streampipes.extensions.api.extractor.IDataSinkParameterExtractor;
+import org.apache.streampipes.extensions.api.pe.IStreamPipesDataSink;
+import org.apache.streampipes.extensions.api.pe.config.IDataSinkConfiguration;
+import org.apache.streampipes.extensions.api.pe.context.EventSinkRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.param.IDataSinkParameters;
+import org.apache.streampipes.model.graph.DataSinkDescription;
+import org.apache.streampipes.model.graph.DataSinkInvocation;
+import org.apache.streampipes.model.runtime.Event;
+import org.apache.streampipes.sdk.builder.sink.DataSinkConfiguration;
+import org.apache.streampipes.wrapper.params.compat.SinkParams;
 
-public abstract class FlinkDataSinkDeclarer<T extends EventSinkBindingParams>
-    extends EventSinkDeclarer<T, FlinkDataSinkRuntime<T>> {
+public abstract class FlinkDataSinkDeclarer<T extends SinkParams>
+    implements IStreamPipesDataSink {
 
+  @Override
+  public void onPipelineStarted(IDataSinkParameters params, EventSinkRuntimeContext runtimeContext) {
+
+  }
+
+  @Override
+  public void onEvent(Event event) {
+
+  }
+
+  @Override
+  public void onPipelineStopped() {
+
+  }
+
+  @Override
+  public IDataSinkConfiguration declareConfig() {
+    return DataSinkConfiguration.create(
+        () -> this,
+        declareModel()
+    );
+  }
+
+  public abstract FlinkDataSinkProgram<T> getProgram(DataSinkInvocation graph,
+                                                     IDataSinkParameterExtractor extractor);
+
+  public abstract DataSinkDescription declareModel();
 }
diff --git a/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/FlinkDataSinkDeclarer.java b/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/FlinkDataSinkProgram.java
similarity index 75%
copy from streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/FlinkDataSinkDeclarer.java
copy to streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/FlinkDataSinkProgram.java
index a9001b6a4..b22b3d314 100644
--- a/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/FlinkDataSinkDeclarer.java
+++ b/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/FlinkDataSinkProgram.java
@@ -18,10 +18,13 @@
 
 package org.apache.streampipes.wrapper.flink;
 
-import org.apache.streampipes.wrapper.declarer.EventSinkDeclarer;
-import org.apache.streampipes.wrapper.params.binding.EventSinkBindingParams;
+import org.apache.streampipes.wrapper.params.compat.SinkParams;
 
-public abstract class FlinkDataSinkDeclarer<T extends EventSinkBindingParams>
-    extends EventSinkDeclarer<T, FlinkDataSinkRuntime<T>> {
+public abstract class FlinkDataSinkProgram<T extends SinkParams> implements IDataSinkProgram {
 
+  protected T params;
+
+  public FlinkDataSinkProgram(T params) {
+    this.params = params;
+  }
 }
diff --git a/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/FlinkDataSinkRuntime.java b/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/FlinkDataSinkRuntime.java
index 86df158d5..b3885f91b 100644
--- a/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/FlinkDataSinkRuntime.java
+++ b/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/FlinkDataSinkRuntime.java
@@ -18,44 +18,57 @@
 
 package org.apache.streampipes.wrapper.flink;
 
-import org.apache.streampipes.client.StreamPipesClient;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
+import org.apache.streampipes.extensions.api.extractor.IDataSinkParameterExtractor;
+import org.apache.streampipes.extensions.api.pe.IStreamPipesDataSink;
+import org.apache.streampipes.extensions.api.pe.context.EventSinkRuntimeContext;
+import org.apache.streampipes.extensions.api.pe.param.IDataSinkParameters;
+import org.apache.streampipes.extensions.api.pe.runtime.IDataSinkRuntime;
 import org.apache.streampipes.model.graph.DataSinkInvocation;
 import org.apache.streampipes.model.runtime.Event;
-import org.apache.streampipes.wrapper.context.EventSinkRuntimeContext;
-import org.apache.streampipes.wrapper.params.binding.EventSinkBindingParams;
-import org.apache.streampipes.wrapper.params.runtime.EventSinkRuntimeParams;
+import org.apache.streampipes.sdk.extractor.DataSinkParameterExtractor;
+import org.apache.streampipes.wrapper.context.generator.DataSinkContextGenerator;
+import org.apache.streampipes.wrapper.params.generator.DataSinkParameterGenerator;
 
 import org.apache.flink.streaming.api.datastream.DataStream;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public abstract class FlinkDataSinkRuntime<T extends EventSinkBindingParams> extends
-    FlinkRuntime<EventSinkRuntimeParams<T>, T, DataSinkInvocation, EventSinkRuntimeContext> {
+public class FlinkDataSinkRuntime extends FlinkRuntime<
+    IStreamPipesDataSink,
+    DataSinkInvocation,
+    EventSinkRuntimeContext,
+    IDataSinkParameterExtractor,
+    IDataSinkParameters,
+    IDataSinkProgram> implements IDataSinkRuntime {
 
   private static final long serialVersionUID = 1L;
   private static final Logger LOG = LoggerFactory.getLogger(FlinkDataSinkRuntime.class);
 
-  public FlinkDataSinkRuntime(T params,
-                              ConfigExtractor configExtractor,
-                              StreamPipesClient streamPipesClient) {
-    super(params, configExtractor, streamPipesClient);
+  public FlinkDataSinkRuntime() {
+    super(new DataSinkContextGenerator(), new DataSinkParameterGenerator());
   }
 
+
   @Override
-  public void appendExecutionConfig(DataStream<Event>... convertedStream) {
-    getSink(convertedStream);
+  public void appendExecutionConfig(IDataSinkProgram program,
+                                    DataStream<Event>... convertedStream) {
+    program.getSink(convertedStream);
 
   }
 
-  public abstract void getSink(DataStream<Event>... convertedStream1);
+  @Override
+  protected IDataSinkProgram getFlinkProgram(IStreamPipesDataSink pipelineElement) {
+    IDataSinkProgram program;
 
-  protected EventSinkRuntimeParams<T> makeRuntimeParams(ConfigExtractor configExtractor,
-                                                        StreamPipesClient streamPipesClient) {
-    LOG.warn(
-        "The config extractor and StreamPipes Client can currently not be accessed by"
-            + " a deployed Flink program due to non-serializable classes.");
-    return new EventSinkRuntimeParams<>(bindingParams, false, null, null);
+    if (pipelineElement instanceof FlinkDataSinkDeclarer<?>) {
+      program = ((FlinkDataSinkDeclarer<?>) pipelineElement)
+          .getProgram(
+              runtimeParameters.getModel(),
+              DataSinkParameterExtractor.from(runtimeParameters.getModel())
+          );
+    } else {
+      program = new FlinkDataSinkCompatProgram(pipelineElement);
+    }
+    return program;
   }
-
 }
diff --git a/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/FlinkRuntime.java b/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/FlinkRuntime.java
index 8335c53d4..d7cbc967d 100644
--- a/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/FlinkRuntime.java
+++ b/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/FlinkRuntime.java
@@ -18,10 +18,16 @@
 
 package org.apache.streampipes.wrapper.flink;
 
-import org.apache.streampipes.client.StreamPipesClient;
+import org.apache.streampipes.commons.environment.Environments;
 import org.apache.streampipes.commons.exceptions.SpRuntimeException;
 import org.apache.streampipes.dataformat.SpDataFormatDefinition;
-import org.apache.streampipes.extensions.management.config.ConfigExtractor;
+import org.apache.streampipes.extensions.api.extractor.IParameterExtractor;
+import org.apache.streampipes.extensions.api.pe.IStreamPipesPipelineElement;
+import org.apache.streampipes.extensions.api.pe.context.IContextGenerator;
+import org.apache.streampipes.extensions.api.pe.context.RuntimeContext;
+import org.apache.streampipes.extensions.api.pe.param.IParameterGenerator;
+import org.apache.streampipes.extensions.api.pe.param.IPipelineElementParameters;
+import org.apache.streampipes.extensions.api.pe.runtime.IStreamPipesRuntime;
 import org.apache.streampipes.model.SpDataStream;
 import org.apache.streampipes.model.base.InvocableStreamPipesEntity;
 import org.apache.streampipes.model.grounding.JmsTransportProtocol;
@@ -31,15 +37,13 @@ import org.apache.streampipes.model.grounding.SimpleTopicDefinition;
 import org.apache.streampipes.model.grounding.TransportFormat;
 import org.apache.streampipes.model.grounding.TransportProtocol;
 import org.apache.streampipes.model.runtime.Event;
-import org.apache.streampipes.wrapper.context.RuntimeContext;
 import org.apache.streampipes.wrapper.distributed.runtime.DistributedRuntime;
 import org.apache.streampipes.wrapper.flink.consumer.JmsFlinkConsumer;
 import org.apache.streampipes.wrapper.flink.consumer.MqttFlinkConsumer;
 import org.apache.streampipes.wrapper.flink.converter.MapToEventConverter;
 import org.apache.streampipes.wrapper.flink.logger.StatisticLogger;
 import org.apache.streampipes.wrapper.flink.serializer.ByteArrayDeserializer;
-import org.apache.streampipes.wrapper.params.binding.BindingParams;
-import org.apache.streampipes.wrapper.params.runtime.RuntimeParams;
+import org.apache.streampipes.wrapper.params.InternalRuntimeParameters;
 
 import org.apache.flink.client.program.ClusterClient;
 import org.apache.flink.client.program.MiniClusterClient;
@@ -61,34 +65,46 @@ import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.regex.Pattern;
 
-public abstract class FlinkRuntime<T extends RuntimeParams<V, W, X>, V extends BindingParams<W>, W
-    extends
-        InvocableStreamPipesEntity, X extends RuntimeContext> extends
-    DistributedRuntime<T, V, W, X> implements Runnable, Serializable {
-
-  private static final long serialVersionUID = 1L;
+public abstract class FlinkRuntime<
+    PeT extends IStreamPipesPipelineElement<?>,
+    IvT extends InvocableStreamPipesEntity,
+    RcT extends RuntimeContext,
+    ExT extends IParameterExtractor<IvT>,
+    PepT extends IPipelineElementParameters<IvT, ExT>,
+    FpT extends IFlinkProgram>
+    extends DistributedRuntime<PeT, IvT, RcT, ExT, PepT>
+    implements IStreamPipesRuntime<PeT, IvT>, Runnable, Serializable {
 
   protected TimeCharacteristic streamTimeCharacteristic;
   protected FlinkDeploymentConfig config;
   private StreamExecutionEnvironment env;
 
-  public FlinkRuntime(V bindingParams,
-                      ConfigExtractor configExtractor,
-                      StreamPipesClient streamPipesClient) {
-    super(bindingParams, configExtractor, streamPipesClient);
-    this.config = getDeploymentConfig(configExtractor);
+  protected IvT pipelineElementInvocation;
+  protected PeT pipelineElement;
+  protected PepT runtimeParameters;
+
+  protected RcT runtimeContext;
+
+  protected FpT flinkProgram;
+
+  protected InternalRuntimeParameters internalRuntimeParameters;
+
+  public FlinkRuntime(IContextGenerator<RcT, IvT> contextGenerator,
+                      IParameterGenerator<IvT, ExT, PepT> parameterGenerator) {
+    super(contextGenerator, parameterGenerator);
   }
 
   public void run() {
     try {
       if (!this.config.isMiniClusterMode()) {
-        env.execute(bindingParams.getGraph().getElementId());
+        env.execute(runtimeParameters.getModel().getElementId());
       } else {
         FlinkSpMiniCluster.INSTANCE.start();
         FlinkSpMiniCluster
             .INSTANCE
             .getClusterClient()
-            .submitJob(env.getStreamGraph(bindingParams.getGraph().getElementId()).getJobGraph());
+            .submitJob(env.getStreamGraph().getJobGraph());
+            //.submitJob(env.getStreamGraph(runtimeParameters.getModel().getElementId()).getJobGraph());
       }
     } catch (Exception e) {
       e.printStackTrace();
@@ -116,9 +132,9 @@ public abstract class FlinkRuntime<T extends RuntimeParams<V, W, X>, V extends B
    * @return
    */
   private SourceFunction<Map<String, Object>> getStreamSource(int i) {
-    if (bindingParams.getGraph().getInputStreams().size() - 1 >= i) {
+    if (runtimeParameters.getModel().getInputStreams().size() - 1 >= i) {
 
-      SpDataStream stream = bindingParams.getGraph().getInputStreams().get(i);
+      SpDataStream stream = runtimeParameters.getModel().getInputStreams().get(i);
       if (stream != null) {
         TransportProtocol protocol = stream.getEventGrounding().getTransportProtocol();
         TransportFormat format = stream.getEventGrounding().getTransportFormats().get(0);
@@ -163,8 +179,7 @@ public abstract class FlinkRuntime<T extends RuntimeParams<V, W, X>, V extends B
     }
   }
 
-  @Override
-  public void prepareRuntime() throws SpRuntimeException {
+  private void prepareRuntime() throws SpRuntimeException {
     if (config.isMiniClusterMode()) {
       this.env = StreamExecutionEnvironment.createLocalEnvironment();
     } else {
@@ -185,27 +200,22 @@ public abstract class FlinkRuntime<T extends RuntimeParams<V, W, X>, V extends B
     SourceFunction<Map<String, Object>> source2 = getStream2Source();
     if (source2 != null) {
       DataStream<Event> messageStream2 = addSource(source2, 1);
-      appendExecutionConfig(messageStream1, messageStream2);
+      appendExecutionConfig(flinkProgram, messageStream1, messageStream2);
     } else {
-      appendExecutionConfig(messageStream1);
+      appendExecutionConfig(flinkProgram, messageStream1);
     }
   }
 
+  // TODO
   private DataStream<Event> addSource(SourceFunction<Map<String, Object>> sourceFunction,
                                       Integer sourceIndex) {
     return env
         .addSource(sourceFunction)
-        .flatMap(new MapToEventConverter<>(runtimeParams.getSourceInfo(sourceIndex).getSourceId(),
-            runtimeParams))
-        .flatMap(new StatisticLogger(getGraph()));
+        .flatMap(new MapToEventConverter<>(runtimeParameters.getInputSourceInfo(sourceIndex).getSourceId(),
+            runtimeParameters))
+        .flatMap(new StatisticLogger(null));
   }
 
-  @Override
-  public void postDiscard() throws SpRuntimeException {
-
-  }
-
-  @Override
   public void bindRuntime() throws SpRuntimeException {
     try {
       prepareRuntime();
@@ -225,7 +235,7 @@ public abstract class FlinkRuntime<T extends RuntimeParams<V, W, X>, V extends B
             count++;
             Thread.sleep(1000);
             Optional<JobStatusMessage> statusMessageOpt =
-                getJobStatus(bindingParams.getGraph().getElementId());
+                getJobStatus(runtimeParameters.getModel().getElementId());
             if (statusMessageOpt.isPresent()
                 && statusMessageOpt.get().getJobState().name().equals("RUNNING")) {
               isDeployed = true;
@@ -247,27 +257,6 @@ public abstract class FlinkRuntime<T extends RuntimeParams<V, W, X>, V extends B
     }
   }
 
-  @Override
-  public void discardRuntime() throws SpRuntimeException {
-    try {
-      ClusterClient<? extends Comparable<? extends Comparable<?>>> clusterClient = getClusterClient();
-      Optional<JobStatusMessage> jobStatusMessage =
-          getJobStatus(bindingParams.getGraph().getElementId());
-      if (jobStatusMessage.isPresent()) {
-        String jobStatusStr = jobStatusMessage.get().getJobState().name();
-        // Cancel the job if running
-        if (jobStatusStr.equals("RUNNING")) {
-          clusterClient.cancel(jobStatusMessage.get().getJobId());
-        }
-        // else ignore, because job is already discarded
-      } else {
-        throw new SpRuntimeException("Could not stop Flink Job");
-      }
-    } catch (Exception e) {
-      throw new SpRuntimeException("Could not find Flink Job Manager, is it running?");
-    }
-  }
-
   /**
    * This method can be called in case additional environment settings should be applied to the runtime.
    *
@@ -326,9 +315,44 @@ public abstract class FlinkRuntime<T extends RuntimeParams<V, W, X>, V extends B
     }
   }
 
-  protected abstract FlinkDeploymentConfig getDeploymentConfig(ConfigExtractor configExtractor);
+  @Override
+  public void startRuntime(IvT pipelineElementInvocation,
+                           PeT pipelineElement,
+                           PepT runtimeParameters,
+                           RcT runtimeContext) {
+    this.pipelineElementInvocation = pipelineElementInvocation;
+    this.pipelineElement = pipelineElement;
+    this.runtimeParameters = runtimeParameters;
+    this.runtimeContext = runtimeContext;
+    this.internalRuntimeParameters = new InternalRuntimeParameters();
+    this.flinkProgram = getFlinkProgram(pipelineElement);
+    this.config = this.flinkProgram.getDeploymentConfig(Environments.getEnvironment());
+    this.bindRuntime();
+  }
 
-  protected abstract void appendExecutionConfig(DataStream<Event>... convertedStream);
+  @Override
+  public void stopRuntime() {
+    try {
+      ClusterClient<? extends Comparable<? extends Comparable<?>>> clusterClient = getClusterClient();
+      Optional<JobStatusMessage> jobStatusMessage =
+          getJobStatus(runtimeParameters.getModel().getElementId());
+      if (jobStatusMessage.isPresent()) {
+        String jobStatusStr = jobStatusMessage.get().getJobState().name();
+        // Cancel the job if running
+        if (jobStatusStr.equals("RUNNING")) {
+          clusterClient.cancel(jobStatusMessage.get().getJobId());
+        }
+        // else ignore, because job is already discarded
+      } else {
+        throw new SpRuntimeException("Could not stop Flink Job");
+      }
+    } catch (Exception e) {
+      throw new SpRuntimeException("Could not find Flink Job Manager, is it running?");
+    }
+  }
 
+  protected abstract void appendExecutionConfig(FpT program,
+                                                DataStream<Event>... convertedStream);
 
+  protected abstract FpT getFlinkProgram(PeT pipelineElement);
 }
diff --git a/streampipes-wrapper-standalone/src/main/java/org/apache/streampipes/wrapper/standalone/ConfiguredEventProcessor.java b/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/FlinkRuntimeProvider.java
similarity index 58%
rename from streampipes-wrapper-standalone/src/main/java/org/apache/streampipes/wrapper/standalone/ConfiguredEventProcessor.java
rename to streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/FlinkRuntimeProvider.java
index d4e77a9b2..80bdec2c4 100644
--- a/streampipes-wrapper-standalone/src/main/java/org/apache/streampipes/wrapper/standalone/ConfiguredEventProcessor.java
+++ b/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/FlinkRuntimeProvider.java
@@ -16,18 +16,22 @@
  *
  */
 
-package org.apache.streampipes.wrapper.standalone;
+package org.apache.streampipes.wrapper.flink;
 
-import org.apache.streampipes.model.graph.DataProcessorInvocation;
-import org.apache.streampipes.wrapper.params.binding.EventProcessorBindingParams;
-import org.apache.streampipes.wrapper.runtime.EventProcessor;
+import org.apache.streampipes.extensions.api.pe.runtime.IDataProcessorRuntime;
+import org.apache.streampipes.extensions.api.pe.runtime.IDataSinkRuntime;
+import org.apache.streampipes.extensions.api.pe.runtime.IStreamPipesRuntimeProvider;
 
 import java.util.function.Supplier;
 
-public class ConfiguredEventProcessor<T extends EventProcessorBindingParams>
-    extends AbstractConfiguredPipelineElement<DataProcessorInvocation, T, EventProcessor<T>> {
+public class FlinkRuntimeProvider implements IStreamPipesRuntimeProvider {
+  @Override
+  public Supplier<IDataProcessorRuntime> getDataProcessorRuntime() {
+    return FlinkDataProcessorRuntime::new;
+  }
 
-  public ConfiguredEventProcessor(T bindingParams, Supplier<EventProcessor<T>> engineSupplier) {
-    super(bindingParams, engineSupplier);
+  @Override
+  public Supplier<IDataSinkRuntime> getDataSinkRuntime() {
+    return FlinkDataSinkRuntime::new;
   }
 }
diff --git a/streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/routing/SpOutputCollector.java b/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/IDataProcessorProgram.java
similarity index 75%
copy from streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/routing/SpOutputCollector.java
copy to streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/IDataProcessorProgram.java
index 69ab08476..1d22002bd 100644
--- a/streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/routing/SpOutputCollector.java
+++ b/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/IDataProcessorProgram.java
@@ -16,15 +16,13 @@
  *
  */
 
-package org.apache.streampipes.wrapper.routing;
+package org.apache.streampipes.wrapper.flink;
 
-import org.apache.streampipes.messaging.InternalEventProcessor;
 import org.apache.streampipes.model.runtime.Event;
 
-import java.util.Map;
+import org.apache.flink.streaming.api.datastream.DataStream;
 
-public interface SpOutputCollector extends PipelineElementCollector<InternalEventProcessor<Map<String,
-    Object>>> {
+public interface IDataProcessorProgram extends IFlinkProgram {
 
-  void collect(Event event);
+  DataStream<Event> getApplicationLogic(DataStream<Event>... messageStream);
 }
diff --git a/streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/routing/SpOutputCollector.java b/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/IDataSinkProgram.java
similarity index 75%
copy from streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/routing/SpOutputCollector.java
copy to streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/IDataSinkProgram.java
index 69ab08476..eec92d08d 100644
--- a/streampipes-wrapper/src/main/java/org/apache/streampipes/wrapper/routing/SpOutputCollector.java
+++ b/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/IDataSinkProgram.java
@@ -16,15 +16,13 @@
  *
  */
 
-package org.apache.streampipes.wrapper.routing;
+package org.apache.streampipes.wrapper.flink;
 
-import org.apache.streampipes.messaging.InternalEventProcessor;
 import org.apache.streampipes.model.runtime.Event;
 
-import java.util.Map;
+import org.apache.flink.streaming.api.datastream.DataStream;
 
-public interface SpOutputCollector extends PipelineElementCollector<InternalEventProcessor<Map<String,
-    Object>>> {
+public interface IDataSinkProgram extends IFlinkProgram {
 
-  void collect(Event event);
+  void getSink(DataStream<Event>... convertedStream1);
 }
diff --git a/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/FlinkDataProcessorDeclarer.java b/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/IFlinkProgram.java
similarity index 59%
copy from streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/FlinkDataProcessorDeclarer.java
copy to streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/IFlinkProgram.java
index d6bd199d2..623b11454 100644
--- a/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/FlinkDataProcessorDeclarer.java
+++ b/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/IFlinkProgram.java
@@ -18,11 +18,22 @@
 
 package org.apache.streampipes.wrapper.flink;
 
-import org.apache.streampipes.wrapper.declarer.EventProcessorDeclarer;
-import org.apache.streampipes.wrapper.params.binding.EventProcessorBindingParams;
+import org.apache.streampipes.commons.environment.Environment;
 
-public abstract class FlinkDataProcessorDeclarer<T extends EventProcessorBindingParams>
-    extends EventProcessorDeclarer<T, FlinkDataProcessorRuntime<T>> {
+import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
 
+public interface IFlinkProgram {
 
+  default FlinkDeploymentConfig getDeploymentConfig(Environment env) {
+    return new FlinkDeploymentConfig(
+        env.getFlinkJarFileLoc().getValueOrDefault(),
+        env.getFlinkJobmanagerHost().getValueOrDefault(),
+        env.getFlinkJobmanagerPort().getValueOrDefault(),
+        env.getSpDebug().getValueOrDefault()
+    );
+  }
+
+  default void appendEnvironmentConfig(StreamExecutionEnvironment env) {
+
+  }
 }
diff --git a/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/converter/MapToEventConverter.java b/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/converter/MapToEventConverter.java
index 2e1e01983..5e0f82ad3 100644
--- a/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/converter/MapToEventConverter.java
+++ b/streampipes-wrapper-flink/src/main/java/org/apache/streampipes/wrapper/flink/converter/MapToEventConverter.java
@@ -17,30 +17,35 @@
  */
 package org.apache.streampipes.wrapper.flink.converter;
 
+import org.apache.streampipes.extensions.api.pe.param.IInternalRuntimeParameters;
+import org.apache.streampipes.extensions.api.pe.param.IPipelineElementParameters;
 import org.apache.streampipes.model.runtime.Event;
-import org.apache.streampipes.wrapper.params.runtime.RuntimeParams;
+import org.apache.streampipes.wrapper.params.InternalRuntimeParameters;
 
 import org.apache.flink.api.common.functions.FlatMapFunction;
 import org.apache.flink.util.Collector;
 
 import java.util.Map;
 
-public class MapToEventConverter<T extends RuntimeParams<?, ?, ?>> implements
+public class MapToEventConverter<T extends IPipelineElementParameters<?, ?>> implements
     FlatMapFunction<Map<String,
         Object>, Event> {
 
   private static final long serialVersionUID = 1L;
 
-  private T runtimeParams;
-  private String sourceId;
+  private final T runtimeParams;
+  private final String sourceId;
+
+  private final IInternalRuntimeParameters internalRuntimeParameters;
 
   public MapToEventConverter(String sourceId, T runtimeParams) {
     this.sourceId = sourceId;
     this.runtimeParams = runtimeParams;
+    this.internalRuntimeParameters = new InternalRuntimeParameters();
   }
 
   @Override
   public void flatMap(Map<String, Object> inMap, Collector<Event> collector) throws Exception {
-    collector.collect(runtimeParams.makeEvent(inMap, sourceId));
+    collector.collect(internalRuntimeParameters.makeEvent(runtimeParams, inMap, sourceId));
... 4166 lines suppressed ...