diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/10_instance_based.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/10_instance_based.rst
index 7b3936d64..761110b3c 100644
--- a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/10_instance_based.rst
+++ b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/10_instance_based.rst
@@ -3,7 +3,7 @@ Instance-based drifts and detectors
 ===================================
 
 
-.. image:: 10_instance_based/images/MLPro-OA-Drift-Detectors-IB_class_diagram.drawio.png
+.. image:: 10_instance_based/images/MLPro-OA-IB-Drift-Detectors_class_diagram.drawio.png
    :scale: 50%
 
 
@@ -19,7 +19,7 @@ Instance-based drifts and detectors
    :undoc-members:
    :private-members:
    :show-inheritance:
-
+   
 
 .. toctree::
    :maxdepth: 2
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/10_instance_based/10_common_drifts.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/10_instance_based/10_common_drifts.rst
index 52acb232f..6017d6fd0 100644
--- a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/10_instance_based/10_common_drifts.rst
+++ b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/10_instance_based/10_common_drifts.rst
@@ -1,9 +1,10 @@
-.. _target_api_oa_stream_tasks_ad_common_drifts:
+.. _target_api_oa_stream_tasks_ib_dd_common_drifts:
 Common drifts
 =============
-  
-.. automodule:: mlpro.oa.streams.tasks.driftdetectors.drifts.instancebased.basics
+
+.. automodule:: mlpro.oa.streams.tasks.driftdetectors.drifts.instancebased.movement
    :members:
    :undoc-members:
    :private-members:
    :show-inheritance:
+
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/10_instance_based/20_common_algorithms.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/10_instance_based/20_common_algorithms.rst
deleted file mode 100644
index 436df8fd4..000000000
--- a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/10_instance_based/20_common_algorithms.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-.. _target_api_oa_stream_tasks_ad_common_algorithms:
-Common algorithms
-=================
-  
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/10_instance_based/40_drift_detectors.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/10_instance_based/40_drift_detectors.rst
deleted file mode 100644
index 227bbaec4..000000000
--- a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/10_instance_based/40_drift_detectors.rst
+++ /dev/null
@@ -1,36 +0,0 @@
-.. _target_api_oa_stream_tasks_dd:
-Drift detectors
-===============
-
-.. image:: drift_detectors/images/MLPro-OA-Drift-Detectors_class_diagram.drawio.png
-   :scale: 50%
-   
-   
-Template for drift detectors
-----------------------------
-
-.. automodule:: mlpro.oa.streams.tasks.driftdetectors.basics
-   :members:
-   :undoc-members:
-   :private-members:
-   :show-inheritance:
-
-
-Template for drift events
--------------------------
-
-.. automodule:: mlpro.oa.streams.tasks.driftdetectors.drift.basics
-   :members:
-   :undoc-members:
-   :private-members:
-   :show-inheritance:
-
-
-Concrete drift events and algorithms
-------------------------------------
-
-.. toctree::
-   :maxdepth: 2
-   :glob:
-   
-   drift_detectors/*
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/10_instance_based/images/MLPro-OA-CB-Drift-Detectors_class_diagram.drawio b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/10_instance_based/images/MLPro-OA-CB-Drift-Detectors_class_diagram.drawio
deleted file mode 100644
index 9249c1e80..000000000
--- a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/10_instance_based/images/MLPro-OA-CB-Drift-Detectors_class_diagram.drawio
+++ /dev/null
@@ -1,229 +0,0 @@
-<mxfile host="Electron" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/26.0.9 Chrome/128.0.6613.186 Electron/32.2.5 Safari/537.36" version="26.0.9" pages="2">
-  <diagram id="C5RBs43oDa-KdzZeNtuy" name="Page-1">
-    <mxGraphModel dx="2403" dy="1031" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="2336" pageHeight="1654" math="0" shadow="0">
-      <root>
-        <mxCell id="WIyWlLk6GJQsqaUBKTNV-0" />
-        <mxCell id="WIyWlLk6GJQsqaUBKTNV-1" parent="WIyWlLk6GJQsqaUBKTNV-0" />
-        <mxCell id="fcJVb3HREh7NScvAmxeq-0" value="" style="group" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1" connectable="0">
-          <mxGeometry x="923" y="40" width="490" height="220" as="geometry" />
-        </mxCell>
-        <mxCell id="fcJVb3HREh7NScvAmxeq-1" value="&lt;font color=&quot;#000000&quot; size=&quot;1&quot;&gt;&lt;b style=&quot;font-size: 14px&quot;&gt;Legend:&lt;br&gt;&lt;/b&gt;&lt;/font&gt;&lt;br&gt;&lt;br&gt;&lt;br&gt;&lt;font color=&quot;#0000ff&quot; style=&quot;font-size: 6px&quot;&gt;&lt;br&gt;&lt;/font&gt;&lt;span style=&quot;color: rgb(0 , 0 , 0)&quot;&gt;&lt;font style=&quot;font-size: 4px&quot;&gt;&amp;nbsp; &amp;nbsp;&lt;/font&gt;&amp;nbsp;In progress&amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp; In validation&amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp;Ready to use&lt;/span&gt;&lt;font color=&quot;#000000&quot;&gt;&amp;nbsp;&lt;br&gt;&lt;/font&gt;&lt;font color=&quot;#0000ff&quot;&gt;&lt;br&gt;&lt;br&gt;&lt;br&gt;&lt;br&gt;&amp;nbsp;attribute / method()&amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp; New public attribute/method to be implemented&lt;/font&gt;&lt;br&gt;&lt;font color=&quot;#000000&quot;&gt;&amp;nbsp;&lt;/font&gt;&lt;font color=&quot;#000000&quot;&gt;attribute / method()&lt;span&gt; &lt;/span&gt;&amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp;New/inherited public attribute/method that is implemented here&lt;br&gt;&lt;/font&gt;&lt;font color=&quot;#0000ff&quot;&gt;&amp;nbsp;_attribute /&amp;nbsp;&lt;/font&gt;&lt;font color=&quot;#0000ff&quot;&gt;_method()&amp;nbsp; &amp;nbsp; New protected method/attribute to be implemented&lt;/font&gt;&lt;br&gt;&lt;font color=&quot;#000000&quot;&gt;&amp;nbsp;_attribute / _method()&amp;nbsp; &amp;nbsp; New/inherited protected attribute/method that is implemented here&lt;br&gt;&lt;/font&gt;&lt;font color=&quot;#000000&quot;&gt;&lt;br&gt;&lt;br&gt;&lt;br&gt;&lt;br&gt;&lt;br&gt;&lt;/font&gt;" style="text;html=1;align=left;verticalAlign=top;whiteSpace=wrap;rounded=0;fontColor=#006600;strokeColor=#000000;shadow=1;fillColor=#ffffff;" parent="fcJVb3HREh7NScvAmxeq-0" vertex="1">
-          <mxGeometry width="489.99999999999994" height="220" as="geometry" />
-        </mxCell>
-        <mxCell id="fcJVb3HREh7NScvAmxeq-2" value="Depends on" style="endArrow=block;html=1;labelPosition=right;verticalLabelPosition=middle;align=left;verticalAlign=middle;endFill=1;fontSize=12;" parent="fcJVb3HREh7NScvAmxeq-0" edge="1">
-          <mxGeometry x="-1623.1249999999998" y="-2180" width="51.041666666666664" height="50" as="geometry">
-            <mxPoint x="10.20802398989899" y="120.00301587301601" as="sourcePoint" />
-            <mxPoint x="55.990852272727174" y="120.00301587301601" as="targetPoint" />
-            <mxPoint x="98" as="offset" />
-            <Array as="points">
-              <mxPoint x="30.624999999999996" y="120" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="fcJVb3HREh7NScvAmxeq-3" value="Inherits from" style="endArrow=block;html=1;labelPosition=right;verticalLabelPosition=middle;align=left;verticalAlign=middle;endFill=0;fontSize=12;" parent="fcJVb3HREh7NScvAmxeq-0" edge="1">
-          <mxGeometry x="-1623.1249999999998" y="-2180" width="51.041666666666664" height="50" as="geometry">
-            <mxPoint x="10.20802398989899" y="132.3846031746034" as="sourcePoint" />
-            <mxPoint x="55.990852272727174" y="132.3846031746034" as="targetPoint" />
-            <mxPoint x="98" y="1" as="offset" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="fcJVb3HREh7NScvAmxeq-4" value="" style="swimlane;fontStyle=3;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=1;strokeWidth=1;fillColor=#f8cecc;strokeColor=#b85450;gradientColor=#ffffff;swimlaneFillColor=#ffffff;" parent="fcJVb3HREh7NScvAmxeq-0" vertex="1">
-          <mxGeometry x="10.208333333333332" y="40" width="40.83333333333333" height="34" as="geometry">
-            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="fcJVb3HREh7NScvAmxeq-5" value="" style="line;html=1;strokeWidth=1;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;" parent="fcJVb3HREh7NScvAmxeq-4" vertex="1">
-          <mxGeometry y="26" width="40.83333333333333" height="8" as="geometry" />
-        </mxCell>
-        <mxCell id="fcJVb3HREh7NScvAmxeq-6" value="" style="swimlane;fontStyle=3;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=1;strokeWidth=1;fillColor=#fff2cc;strokeColor=#d6b656;gradientColor=#ffffff;swimlaneFillColor=#ffffff;" parent="fcJVb3HREh7NScvAmxeq-0" vertex="1">
-          <mxGeometry x="112.29166666666666" y="40" width="40.83333333333333" height="34" as="geometry">
-            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="fcJVb3HREh7NScvAmxeq-7" value="" style="line;html=1;strokeWidth=1;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;" parent="fcJVb3HREh7NScvAmxeq-6" vertex="1">
-          <mxGeometry y="26" width="40.83333333333333" height="8" as="geometry" />
-        </mxCell>
-        <mxCell id="fcJVb3HREh7NScvAmxeq-8" value="" style="swimlane;fontStyle=3;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=1;strokeWidth=1;fillColor=#dae8fc;strokeColor=#6c8ebf;gradientColor=#ffffff;swimlaneFillColor=#ffffff;" parent="fcJVb3HREh7NScvAmxeq-0" vertex="1">
-          <mxGeometry x="214.37499999999997" y="40" width="40.83333333333333" height="34" as="geometry">
-            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="fcJVb3HREh7NScvAmxeq-9" value="" style="line;html=1;strokeWidth=1;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;" parent="fcJVb3HREh7NScvAmxeq-8" vertex="1">
-          <mxGeometry y="26" width="40.83333333333333" height="8" as="geometry" />
-        </mxCell>
-        <mxCell id="0cJ1NAXk0Xtcf3CmwPfC-0" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="4use4ZCXdNiZSNTW99xv-1" target="4use4ZCXdNiZSNTW99xv-16" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="4use4ZCXdNiZSNTW99xv-1" value="DriftDetectorCB&#xa;(DriftDetector)" style="swimlane;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=41;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=1;strokeWidth=1;fillColor=#fff2cc;strokeColor=#d6b656;swimlaneFillColor=#ffffff;gradientColor=#F5F5F5;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="40" y="100" width="350" height="250" as="geometry">
-            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="4use4ZCXdNiZSNTW99xv-2" value="C_TYPE = &#39;Cluster-based Drift Detector&#39;" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
-          <mxGeometry y="41" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="wYuSwdfiTg43MnoHxwxG-2" value="C_REQ_CLUSTER_PROPERTIES : PropertyDefinitions = []" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
-          <mxGeometry y="65" width="350" height="26" as="geometry" />
-        </mxCell>
-        <mxCell id="wYuSwdfiTg43MnoHxwxG-3" value="_clusterer : ClusterAnalyzer" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
-          <mxGeometry y="91" width="350" height="25" as="geometry" />
-        </mxCell>
-        <mxCell id="4use4ZCXdNiZSNTW99xv-5" value="" style="line;html=1;strokeWidth=1;align=center;verticalAlign=top;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;rounded=0;shadow=1;strokeColor=#6c8ebf;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;fontColor=default;fontStyle=3;fillColor=#dae8fc;gradientColor=#ffffff;" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
-          <mxGeometry y="116" width="350" height="8" as="geometry" />
-        </mxCell>
-        <mxCell id="4use4ZCXdNiZSNTW99xv-6" value="__init__( p_clusterer : ClusterAnalyzer,&#xa;               p_name : str = None,&#xa;               p_range_max=OAStreamTask.C_RANGE_THREAD,&#xa;               p_ada : bool = True,&#xa;               p_duplicate_data : bool = False&#xa;               p_visualize : bool = False,&#xa;               p_logging = Log.C_LOG_ALL,&#xa;               **p_kwargs )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontStyle=1" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
-          <mxGeometry y="124" width="350" height="126" as="geometry" />
-        </mxCell>
-        <mxCell id="4use4ZCXdNiZSNTW99xv-16" value="DriftCB&#xa;(Drift)" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=40;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=1;strokeWidth=1;fillColor=#fff2cc;strokeColor=#d6b656;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;gradientColor=#F5F5F5;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="510" y="100" width="290" height="390" as="geometry">
-            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="8-Sli__s1YHfQ2Dl7trR-0" value="C_TYPE = &#39;Cluster-based Drift&#39;" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
-          <mxGeometry y="40" width="290" height="26" as="geometry" />
-        </mxCell>
-        <mxCell id="oLJumqx1HHhM9YScGNT0-24" value="C_PLOT_ACTIVE = True" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
-          <mxGeometry y="66" width="290" height="26" as="geometry" />
-        </mxCell>
-        <mxCell id="wYuSwdfiTg43MnoHxwxG-0" value="_clusters : dict[Cluster]" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontStyle=0" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
-          <mxGeometry y="92" width="290" height="26" as="geometry" />
-        </mxCell>
-        <mxCell id="wYuSwdfiTg43MnoHxwxG-1" value="_properties : dict" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontStyle=0" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
-          <mxGeometry y="118" width="290" height="26" as="geometry" />
-        </mxCell>
-        <mxCell id="4use4ZCXdNiZSNTW99xv-20" value="" style="line;html=1;strokeWidth=1;align=center;verticalAlign=top;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;rounded=0;shadow=1;strokeColor=#6c8ebf;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;fontColor=default;fontStyle=1;fillColor=#dae8fc;gradientColor=#ffffff;" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
-          <mxGeometry y="144" width="290" height="8" as="geometry" />
-        </mxCell>
-        <mxCell id="4use4ZCXdNiZSNTW99xv-21" value="__init__( p_drift_status : bool,&#xa;                p_id : int = 0,&#xa;                p_tstamp : datetime,&#xa;                p_visualise : bool = False,&#xa;                p_raising_object : object = None,&#xa;                p_clusters : dict[Cluster],&#xa;                p_properties : dict,&#xa;                **p_kwargs )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontStyle=1" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
-          <mxGeometry y="152" width="290" height="118" as="geometry" />
-        </mxCell>
-        <mxCell id="oLJumqx1HHhM9YScGNT0-29" value="get_clusters() -&gt; dict[Cluster]" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
-          <mxGeometry y="270" width="290" height="20" as="geometry" />
-        </mxCell>
-        <mxCell id="hOcUKRqpv3udX4BvXm5B-9" value="get_properties() -&gt; dict" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
-          <mxGeometry y="290" width="290" height="20" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-7" value="_init_plot_2d( p_figure: Figure, &#xa;                       p_settings : PlotSettings )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontColor=#FF0000;" vertex="1" parent="4use4ZCXdNiZSNTW99xv-16">
-          <mxGeometry y="310" width="290" height="40" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-8" value="_init_plot_3d( p_figure: Figure, &#xa;                       p_settings : PlotSettings )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontColor=#FF0000;" vertex="1" parent="4use4ZCXdNiZSNTW99xv-16">
-          <mxGeometry y="350" width="290" height="40" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-6" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="QPhXRuD-ExfV2QrfVq-p-0" target="4use4ZCXdNiZSNTW99xv-1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-21" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=1;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="QPhXRuD-ExfV2QrfVq-p-0" target="QPhXRuD-ExfV2QrfVq-p-9">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-0" value="DriftDetectorCBMovement&#xa;(DriftDetectorCB)" style="swimlane;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=41;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=1;strokeWidth=1;fillColor=#f8cecc;strokeColor=#b85450;swimlaneFillColor=#ffffff;gradientColor=#F5F5F5;" vertex="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
-          <mxGeometry x="40" y="600" width="350" height="912" as="geometry">
-            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-1" value="C_TYPE = &#39;Cluster-based Drift Detector&#39;" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="41" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-2" value="C_REQ_CLUSTER_PROPERTIES : PropertyDefinitions &#xa;           = [ cprop_centroid2 ]" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="65" width="350" height="40" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-31" value="_inst_change_det : bool" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="105" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-32" value="_inst_state_det : bool" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="129" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-33" value="_min_vel_thresh : float" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="153" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-34" value="_buffer_size" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="177" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-35" value="_ema_alpha : float" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="201" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-36" value="_with_time_calculation : bool" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="225" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-37" value="_init_skip : int" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="249" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-38" value="_count : int" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="273" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-39" value="_count_change : dict" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="297" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-40" value="_centroids_history : dict" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="321" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-41" value="_times_history : dict" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="345" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-42" value="_velocities_history : dict" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="369" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-43" value="_accelerations_history : dict" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="393" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-44" value="_cluster_states : dict" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="417" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-4" value="" style="line;html=1;strokeWidth=1;align=center;verticalAlign=top;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;rounded=0;shadow=1;strokeColor=#6c8ebf;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;fontColor=default;fontStyle=3;fillColor=#dae8fc;gradientColor=#ffffff;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="441" width="350" height="8" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-5" value="__init__( &#xa;  p_clusterer : ClusterAnalyzer,&#xa;  p_instantaneous_velocity_change_detection : bool = True,&#xa;  p_min_velocity_threshoold : float = 0.01,&#xa;  p_state_change_detection : bool = False,&#xa;  p_min_acceleration_threshold : float = None,&#xa;  p_buffer_size = 5,&#xa;  p_ema_alpha : float = 0.7,&#xa;  p_with_time_calculation : bool = True,&#xa;  p_initial_skip : int = 1,&#xa;  p_name : str = None,&#xa;  p_range_max=OAStreamTask.C_RANGE_THREAD,&#xa;  p_ada : bool = True,&#xa;  p_duplicate_data : bool = False&#xa;  p_visualize : bool = False,&#xa;  p_logging = Log.C_LOG_ALL,&#xa;  **p_kwargs )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontStyle=1" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="449" width="350" height="247" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-22" value="_run( p_inst : InstDict )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontColor=#FF0000;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="696" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-23" value="_initialize_cluster( ... )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontColor=#FF0000;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="720" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-24" value="_calculate_velocity( ... )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontColor=#FF0000;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="744" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-25" value="_calculate_acceleration( ... )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontColor=#FF0000;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="768" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-26" value="_inst_vel_change_detection( ... )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontColor=#FF0000;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="792" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-27" value="_calculate_ema( ... )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontColor=#FF0000;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="816" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-28" value="_detect_state_change( ... )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontColor=#FF0000;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="840" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-29" value="get_velocities() " style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontColor=#FF0000;fontStyle=1" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="864" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-30" value="get_accelerations()" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontColor=#FF0000;fontStyle=1" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="888" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-20" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="QPhXRuD-ExfV2QrfVq-p-9" target="4use4ZCXdNiZSNTW99xv-16">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-9" value="DriftCBMovement&#xa;(DriftCB)" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=40;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=1;strokeWidth=1;fillColor=#fff2cc;strokeColor=#d6b656;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;gradientColor=#F5F5F5;" vertex="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
-          <mxGeometry x="510" y="600" width="290" height="90" as="geometry">
-            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-10" value="C_TYPE = &#39;Cluster-based Drift (Movement)&#39;" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-9">
-          <mxGeometry y="40" width="290" height="26" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-14" value="" style="line;html=1;strokeWidth=1;align=center;verticalAlign=top;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;rounded=0;shadow=1;strokeColor=#6c8ebf;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;fontColor=default;fontStyle=1;fillColor=#dae8fc;gradientColor=#ffffff;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-9">
-          <mxGeometry y="66" width="290" height="8" as="geometry" />
-        </mxCell>
-      </root>
-    </mxGraphModel>
-  </diagram>
-  <diagram id="lryuDQluacSowWsRYUra" name="Page-2">
-    <mxGraphModel dx="1098" dy="828" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0">
-      <root>
-        <mxCell id="0" />
-        <mxCell id="1" parent="0" />
-      </root>
-    </mxGraphModel>
-  </diagram>
-</mxfile>
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/10_instance_based/images/MLPro-OA-IB-Drift-Detectors_class_diagram.drawio b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/10_instance_based/images/MLPro-OA-IB-Drift-Detectors_class_diagram.drawio
new file mode 100644
index 000000000..8f9ded7f3
--- /dev/null
+++ b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/10_instance_based/images/MLPro-OA-IB-Drift-Detectors_class_diagram.drawio
@@ -0,0 +1,96 @@
+<mxfile host="Electron" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/26.0.16 Chrome/132.0.6834.196 Electron/34.2.0 Safari/537.36" version="26.0.16">
+  <diagram id="C5RBs43oDa-KdzZeNtuy" name="Page-1">
+    <mxGraphModel dx="2004" dy="1237" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="2336" pageHeight="1654" math="0" shadow="0">
+      <root>
+        <mxCell id="WIyWlLk6GJQsqaUBKTNV-0" />
+        <mxCell id="WIyWlLk6GJQsqaUBKTNV-1" parent="WIyWlLk6GJQsqaUBKTNV-0" />
+        <mxCell id="fcJVb3HREh7NScvAmxeq-0" value="" style="group" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1" connectable="0">
+          <mxGeometry x="923" y="40" width="490" height="220" as="geometry" />
+        </mxCell>
+        <mxCell id="fcJVb3HREh7NScvAmxeq-1" value="&lt;font color=&quot;#000000&quot; size=&quot;1&quot;&gt;&lt;b style=&quot;font-size: 14px&quot;&gt;Legend:&lt;br&gt;&lt;/b&gt;&lt;/font&gt;&lt;br&gt;&lt;br&gt;&lt;br&gt;&lt;font color=&quot;#0000ff&quot; style=&quot;font-size: 6px&quot;&gt;&lt;br&gt;&lt;/font&gt;&lt;span style=&quot;color: rgb(0 , 0 , 0)&quot;&gt;&lt;font style=&quot;font-size: 4px&quot;&gt;&amp;nbsp; &amp;nbsp;&lt;/font&gt;&amp;nbsp;In progress&amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp; In validation&amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp;Ready to use&lt;/span&gt;&lt;font color=&quot;#000000&quot;&gt;&amp;nbsp;&lt;br&gt;&lt;/font&gt;&lt;font color=&quot;#0000ff&quot;&gt;&lt;br&gt;&lt;br&gt;&lt;br&gt;&lt;br&gt;&amp;nbsp;attribute / method()&amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp; New public attribute/method to be implemented&lt;/font&gt;&lt;br&gt;&lt;font color=&quot;#000000&quot;&gt;&amp;nbsp;&lt;/font&gt;&lt;font color=&quot;#000000&quot;&gt;attribute / method()&lt;span&gt; &lt;/span&gt;&amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp;New/inherited public attribute/method that is implemented here&lt;br&gt;&lt;/font&gt;&lt;font color=&quot;#0000ff&quot;&gt;&amp;nbsp;_attribute /&amp;nbsp;&lt;/font&gt;&lt;font color=&quot;#0000ff&quot;&gt;_method()&amp;nbsp; &amp;nbsp; New protected method/attribute to be implemented&lt;/font&gt;&lt;br&gt;&lt;font color=&quot;#000000&quot;&gt;&amp;nbsp;_attribute / _method()&amp;nbsp; &amp;nbsp; New/inherited protected attribute/method that is implemented here&lt;br&gt;&lt;/font&gt;&lt;font color=&quot;#000000&quot;&gt;&lt;br&gt;&lt;br&gt;&lt;br&gt;&lt;br&gt;&lt;br&gt;&lt;/font&gt;" style="text;html=1;align=left;verticalAlign=top;whiteSpace=wrap;rounded=0;fontColor=#006600;strokeColor=#000000;shadow=1;fillColor=#ffffff;" parent="fcJVb3HREh7NScvAmxeq-0" vertex="1">
+          <mxGeometry width="489.99999999999994" height="220" as="geometry" />
+        </mxCell>
+        <mxCell id="fcJVb3HREh7NScvAmxeq-2" value="Depends on" style="endArrow=block;html=1;labelPosition=right;verticalLabelPosition=middle;align=left;verticalAlign=middle;endFill=1;fontSize=12;" parent="fcJVb3HREh7NScvAmxeq-0" edge="1">
+          <mxGeometry x="-1623.1249999999998" y="-2180" width="51.041666666666664" height="50" as="geometry">
+            <mxPoint x="10.20802398989899" y="120.00301587301601" as="sourcePoint" />
+            <mxPoint x="55.990852272727174" y="120.00301587301601" as="targetPoint" />
+            <mxPoint x="98" as="offset" />
+            <Array as="points">
+              <mxPoint x="30.624999999999996" y="120" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="fcJVb3HREh7NScvAmxeq-3" value="Inherits from" style="endArrow=block;html=1;labelPosition=right;verticalLabelPosition=middle;align=left;verticalAlign=middle;endFill=0;fontSize=12;" parent="fcJVb3HREh7NScvAmxeq-0" edge="1">
+          <mxGeometry x="-1623.1249999999998" y="-2180" width="51.041666666666664" height="50" as="geometry">
+            <mxPoint x="10.20802398989899" y="132.3846031746034" as="sourcePoint" />
+            <mxPoint x="55.990852272727174" y="132.3846031746034" as="targetPoint" />
+            <mxPoint x="98" y="1" as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="fcJVb3HREh7NScvAmxeq-4" value="" style="swimlane;fontStyle=3;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=1;strokeWidth=1;fillColor=#f8cecc;strokeColor=#b85450;gradientColor=#ffffff;swimlaneFillColor=#ffffff;" parent="fcJVb3HREh7NScvAmxeq-0" vertex="1">
+          <mxGeometry x="10.208333333333332" y="40" width="40.83333333333333" height="34" as="geometry">
+            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="fcJVb3HREh7NScvAmxeq-5" value="" style="line;html=1;strokeWidth=1;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;" parent="fcJVb3HREh7NScvAmxeq-4" vertex="1">
+          <mxGeometry y="26" width="40.83333333333333" height="8" as="geometry" />
+        </mxCell>
+        <mxCell id="fcJVb3HREh7NScvAmxeq-6" value="" style="swimlane;fontStyle=3;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=1;strokeWidth=1;fillColor=#fff2cc;strokeColor=#d6b656;gradientColor=#ffffff;swimlaneFillColor=#ffffff;" parent="fcJVb3HREh7NScvAmxeq-0" vertex="1">
+          <mxGeometry x="112.29166666666666" y="40" width="40.83333333333333" height="34" as="geometry">
+            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="fcJVb3HREh7NScvAmxeq-7" value="" style="line;html=1;strokeWidth=1;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;" parent="fcJVb3HREh7NScvAmxeq-6" vertex="1">
+          <mxGeometry y="26" width="40.83333333333333" height="8" as="geometry" />
+        </mxCell>
+        <mxCell id="fcJVb3HREh7NScvAmxeq-8" value="" style="swimlane;fontStyle=3;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=1;strokeWidth=1;fillColor=#dae8fc;strokeColor=#6c8ebf;gradientColor=#ffffff;swimlaneFillColor=#ffffff;" parent="fcJVb3HREh7NScvAmxeq-0" vertex="1">
+          <mxGeometry x="214.37499999999997" y="40" width="40.83333333333333" height="34" as="geometry">
+            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="fcJVb3HREh7NScvAmxeq-9" value="" style="line;html=1;strokeWidth=1;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;" parent="fcJVb3HREh7NScvAmxeq-8" vertex="1">
+          <mxGeometry y="26" width="40.83333333333333" height="8" as="geometry" />
+        </mxCell>
+        <mxCell id="0cJ1NAXk0Xtcf3CmwPfC-0" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="4use4ZCXdNiZSNTW99xv-1" target="4use4ZCXdNiZSNTW99xv-16" edge="1">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="4use4ZCXdNiZSNTW99xv-1" value="DriftDetectorIB&#xa;(DriftDetector)" style="swimlane;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=41;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=1;strokeWidth=1;fillColor=#fff2cc;strokeColor=#d6b656;swimlaneFillColor=#ffffff;gradientColor=#FFFFFF;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="40" y="100" width="350" height="80" as="geometry">
+            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="4use4ZCXdNiZSNTW99xv-2" value="C_TYPE = &#39;Instance-based Drift Detector&#39;" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
+          <mxGeometry y="41" width="350" height="24" as="geometry" />
+        </mxCell>
+        <mxCell id="4use4ZCXdNiZSNTW99xv-5" value="" style="line;html=1;strokeWidth=1;align=center;verticalAlign=top;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;rounded=0;shadow=1;strokeColor=#6c8ebf;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;fontColor=default;fontStyle=3;fillColor=#dae8fc;gradientColor=#ffffff;" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
+          <mxGeometry y="65" width="350" height="8" as="geometry" />
+        </mxCell>
+        <mxCell id="4use4ZCXdNiZSNTW99xv-16" value="DriftIB&#xa;(Drift)" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=40;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=1;strokeWidth=1;fillColor=#fff2cc;strokeColor=#d6b656;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;gradientColor=#F5F5F5;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="510" y="100" width="290" height="190" as="geometry">
+            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="wYuSwdfiTg43MnoHxwxG-0" value="instances : list[Instance]" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontStyle=1" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
+          <mxGeometry y="40" width="290" height="26" as="geometry" />
+        </mxCell>
+        <mxCell id="4use4ZCXdNiZSNTW99xv-20" value="" style="line;html=1;strokeWidth=1;align=center;verticalAlign=top;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;rounded=0;shadow=1;strokeColor=#6c8ebf;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;fontColor=default;fontStyle=1;fillColor=#dae8fc;gradientColor=#ffffff;" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
+          <mxGeometry y="66" width="290" height="8" as="geometry" />
+        </mxCell>
+        <mxCell id="4use4ZCXdNiZSNTW99xv-21" value="__init__( p_drift_status : bool,&#xa;                p_instances : list[Instance],&#xa;                p_id : int = 0,&#xa;                p_tstamp : datetime,&#xa;                p_visualise : bool = False,&#xa;                p_raising_object : object = None,&#xa;                **p_kwargs )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontStyle=1" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
+          <mxGeometry y="74" width="290" height="110" as="geometry" />
+        </mxCell>
+        <mxCell id="QPhXRuD-ExfV2QrfVq-p-20" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="QPhXRuD-ExfV2QrfVq-p-9" target="4use4ZCXdNiZSNTW99xv-16" edge="1">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="QPhXRuD-ExfV2QrfVq-p-9" value="DriftIBMovement&#xa;(DriftIB)" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=40;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=1;strokeWidth=1;fillColor=#fff2cc;strokeColor=#d6b656;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;gradientColor=#F5F5F5;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="510" y="370" width="290" height="60" as="geometry">
+            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="QPhXRuD-ExfV2QrfVq-p-14" value="" style="line;html=1;strokeWidth=1;align=center;verticalAlign=top;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;rounded=0;shadow=1;strokeColor=#6c8ebf;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;fontColor=default;fontStyle=1;fillColor=#dae8fc;gradientColor=#ffffff;" parent="QPhXRuD-ExfV2QrfVq-p-9" vertex="1">
+          <mxGeometry y="40" width="290" height="8" as="geometry" />
+        </mxCell>
+      </root>
+    </mxGraphModel>
+  </diagram>
+</mxfile>
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/10_instance_based/images/MLPro-OA-IB-Drift-Detectors_class_diagram.drawio.png b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/10_instance_based/images/MLPro-OA-IB-Drift-Detectors_class_diagram.drawio.png
new file mode 100644
index 000000000..204c95241
Binary files /dev/null and b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/10_instance_based/images/MLPro-OA-IB-Drift-Detectors_class_diagram.drawio.png differ
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/20_cluster_based.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/20_cluster_based.rst.off
similarity index 83%
rename from doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/20_cluster_based.rst
rename to doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/20_cluster_based.rst.off
index a09ae88b9..c9269c098 100644
--- a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/20_cluster_based.rst
+++ b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/20_cluster_based.rst.off
@@ -1,9 +1,9 @@
 .. _target_api_oa_stream_tasks_dd_cb:
 Cluster-based drifts and detectors
-===================================
+==================================
 
 
-.. image:: 20_cluster_based/images/MLPro-OA-Drift-Detectors-CB_class_diagram.drawio.png
+.. image:: 20_cluster_based/images/MLPro-OA-CB-Drift-Detectors_class_diagram.drawio.png
    :scale: 50%
 
 
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/20_cluster_based/30_cluster_based.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/20_cluster_based/30_cluster_based.rst
deleted file mode 100644
index 30d1b7a43..000000000
--- a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/20_cluster_based/30_cluster_based.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-.. _target_api_oa_stream_tasks_ad_cb:
-Cluster-based drifts and detectors
-=====================================
-
-
-.. image:: cluster_based/images/MLPro-OA-CB-Drift-Detectors_class_diagram.drawio.png
-   :scale: 50%
-
-
-.. toctree::
-   :maxdepth: 2
-   :glob:
-   
-   cluster_based/*
\ No newline at end of file
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/20_cluster_based/images/.$MLPro-OA-CB-Drift-Detectors_class_diagram.drawio.bkp b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/20_cluster_based/images/.$MLPro-OA-CB-Drift-Detectors_class_diagram.drawio.bkp
index 3e94fcfa5..dced91ced 100644
--- a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/20_cluster_based/images/.$MLPro-OA-CB-Drift-Detectors_class_diagram.drawio.bkp
+++ b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/20_cluster_based/images/.$MLPro-OA-CB-Drift-Detectors_class_diagram.drawio.bkp
@@ -1,11 +1,11 @@
-<mxfile host="Electron" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/26.0.9 Chrome/128.0.6613.186 Electron/32.2.5 Safari/537.36" version="26.0.9" pages="2">
+<mxfile host="Electron" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/26.0.16 Chrome/132.0.6834.196 Electron/34.2.0 Safari/537.36" version="26.0.16">
   <diagram id="C5RBs43oDa-KdzZeNtuy" name="Page-1">
-    <mxGraphModel dx="2403" dy="1031" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="2336" pageHeight="1654" math="0" shadow="0">
+    <mxGraphModel dx="2004" dy="1237" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="2336" pageHeight="1654" math="0" shadow="0">
       <root>
         <mxCell id="WIyWlLk6GJQsqaUBKTNV-0" />
         <mxCell id="WIyWlLk6GJQsqaUBKTNV-1" parent="WIyWlLk6GJQsqaUBKTNV-0" />
         <mxCell id="fcJVb3HREh7NScvAmxeq-0" value="" style="group" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1" connectable="0">
-          <mxGeometry x="510" y="40" width="490" height="220" as="geometry" />
+          <mxGeometry x="923" y="40" width="490" height="220" as="geometry" />
         </mxCell>
         <mxCell id="fcJVb3HREh7NScvAmxeq-1" value="&lt;font color=&quot;#000000&quot; size=&quot;1&quot;&gt;&lt;b style=&quot;font-size: 14px&quot;&gt;Legend:&lt;br&gt;&lt;/b&gt;&lt;/font&gt;&lt;br&gt;&lt;br&gt;&lt;br&gt;&lt;font color=&quot;#0000ff&quot; style=&quot;font-size: 6px&quot;&gt;&lt;br&gt;&lt;/font&gt;&lt;span style=&quot;color: rgb(0 , 0 , 0)&quot;&gt;&lt;font style=&quot;font-size: 4px&quot;&gt;&amp;nbsp; &amp;nbsp;&lt;/font&gt;&amp;nbsp;In progress&amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp; In validation&amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp;Ready to use&lt;/span&gt;&lt;font color=&quot;#000000&quot;&gt;&amp;nbsp;&lt;br&gt;&lt;/font&gt;&lt;font color=&quot;#0000ff&quot;&gt;&lt;br&gt;&lt;br&gt;&lt;br&gt;&lt;br&gt;&amp;nbsp;attribute / method()&amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp; New public attribute/method to be implemented&lt;/font&gt;&lt;br&gt;&lt;font color=&quot;#000000&quot;&gt;&amp;nbsp;&lt;/font&gt;&lt;font color=&quot;#000000&quot;&gt;attribute / method()&lt;span&gt; &lt;/span&gt;&amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp;New/inherited public attribute/method that is implemented here&lt;br&gt;&lt;/font&gt;&lt;font color=&quot;#0000ff&quot;&gt;&amp;nbsp;_attribute /&amp;nbsp;&lt;/font&gt;&lt;font color=&quot;#0000ff&quot;&gt;_method()&amp;nbsp; &amp;nbsp; New protected method/attribute to be implemented&lt;/font&gt;&lt;br&gt;&lt;font color=&quot;#000000&quot;&gt;&amp;nbsp;_attribute / _method()&amp;nbsp; &amp;nbsp; New/inherited protected attribute/method that is implemented here&lt;br&gt;&lt;/font&gt;&lt;font color=&quot;#000000&quot;&gt;&lt;br&gt;&lt;br&gt;&lt;br&gt;&lt;br&gt;&lt;br&gt;&lt;/font&gt;" style="text;html=1;align=left;verticalAlign=top;whiteSpace=wrap;rounded=0;fontColor=#006600;strokeColor=#000000;shadow=1;fillColor=#ffffff;" parent="fcJVb3HREh7NScvAmxeq-0" vertex="1">
           <mxGeometry width="489.99999999999994" height="220" as="geometry" />
@@ -54,94 +54,96 @@
         <mxCell id="0cJ1NAXk0Xtcf3CmwPfC-0" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="4use4ZCXdNiZSNTW99xv-1" target="4use4ZCXdNiZSNTW99xv-16" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="4use4ZCXdNiZSNTW99xv-1" value="DriftDetector&#xa;(OATask)" style="swimlane;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=41;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=1;strokeWidth=1;fillColor=#dae8fc;strokeColor=#6c8ebf;swimlaneFillColor=#ffffff;gradientColor=#ffffff;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="40" y="100" width="350" height="550" as="geometry">
+        <mxCell id="4use4ZCXdNiZSNTW99xv-1" value="DriftDetectorCB&#xa;(DriftDetector)" style="swimlane;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=41;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=1;strokeWidth=1;fillColor=#fff2cc;strokeColor=#d6b656;swimlaneFillColor=#ffffff;gradientColor=#F5F5F5;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="40" y="100" width="350" height="250" as="geometry">
             <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="4use4ZCXdNiZSNTW99xv-2" value="C_TYPE                                           = &#39;Drift Detector&#39;" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
+        <mxCell id="4use4ZCXdNiZSNTW99xv-2" value="C_TYPE = &#39;Cluster-based Drift Detector&#39;" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
           <mxGeometry y="41" width="350" height="24" as="geometry" />
         </mxCell>
-        <mxCell id="oLJumqx1HHhM9YScGNT0-0" value="C_PLOT_ACTIVE &amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp; &lt;span style=&quot;white-space: pre;&quot;&gt;&#x9;&lt;/span&gt;&lt;span style=&quot;white-space: pre;&quot;&gt;&#x9;&lt;/span&gt;&amp;nbsp;= True" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;html=1;" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
+        <mxCell id="wYuSwdfiTg43MnoHxwxG-2" value="C_REQ_CLUSTER_PROPERTIES : PropertyDefinitions = []" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
           <mxGeometry y="65" width="350" height="26" as="geometry" />
         </mxCell>
-        <mxCell id="iRqbgX-deYLXcJWkZiLP-0" value="C_PLOT_STANDALONE                 = False" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
-          <mxGeometry y="91" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="wYuSwdfiTg43MnoHxwxG-2" value="_drifts : Dict[Drift]" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" vertex="1" parent="4use4ZCXdNiZSNTW99xv-1">
-          <mxGeometry y="115" width="350" height="26" as="geometry" />
-        </mxCell>
-        <mxCell id="wYuSwdfiTg43MnoHxwxG-3" value="_drift_id : int" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" vertex="1" parent="4use4ZCXdNiZSNTW99xv-1">
-          <mxGeometry y="141" width="350" height="25" as="geometry" />
+        <mxCell id="wYuSwdfiTg43MnoHxwxG-3" value="_clusterer : ClusterAnalyzer" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
+          <mxGeometry y="91" width="350" height="25" as="geometry" />
         </mxCell>
         <mxCell id="4use4ZCXdNiZSNTW99xv-5" value="" style="line;html=1;strokeWidth=1;align=center;verticalAlign=top;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;rounded=0;shadow=1;strokeColor=#6c8ebf;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;fontColor=default;fontStyle=3;fillColor=#dae8fc;gradientColor=#ffffff;" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
-          <mxGeometry y="166" width="350" height="8" as="geometry" />
+          <mxGeometry y="116" width="350" height="8" as="geometry" />
         </mxCell>
-        <mxCell id="4use4ZCXdNiZSNTW99xv-6" value="__init__( p_name : str = None,&#xa;               p_range_max=OAStreamTask.C_RANGE_THREAD,&#xa;               p_ada : bool = True,&#xa;               p_duplicate_data : bool = False&#xa;               p_visualize : bool = False,&#xa;               p_logging = Log.C_LOG_ALL,&#xa;               **p_kwargs )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontStyle=1" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
-          <mxGeometry y="174" width="350" height="109" as="geometry" />
+        <mxCell id="4use4ZCXdNiZSNTW99xv-6" value="__init__( p_clusterer : ClusterAnalyzer,&#xa;               p_name : str = None,&#xa;               p_range_max=OAStreamTask.C_RANGE_THREAD,&#xa;               p_ada : bool = True,&#xa;               p_duplicate_data : bool = False&#xa;               p_visualize : bool = False,&#xa;               p_logging = Log.C_LOG_ALL,&#xa;               **p_kwargs )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontStyle=1" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
+          <mxGeometry y="124" width="350" height="126" as="geometry" />
         </mxCell>
-        <mxCell id="4use4ZCXdNiZSNTW99xv-8" value="get_drifts()" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;shadow=1;fontStyle=1" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
-          <mxGeometry y="283" width="350" height="30" as="geometry" />
+        <mxCell id="4use4ZCXdNiZSNTW99xv-16" value="DriftCB&#xa;(Drift)" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=40;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=1;strokeWidth=1;fillColor=#f8cecc;strokeColor=#b85450;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;gradientColor=#FFFFFF;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="510" y="100" width="290" height="330" as="geometry">
+            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
+          </mxGeometry>
         </mxCell>
-        <mxCell id="N38WU9mJ-Era6qwWuLtT-0" value="_get_next_drift_id() -&gt; int" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;shadow=1;" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
-          <mxGeometry y="313" width="350" height="30" as="geometry" />
+        <mxCell id="oLJumqx1HHhM9YScGNT0-24" value="C_PLOT_ACTIVE = True" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
+          <mxGeometry y="40" width="290" height="26" as="geometry" />
         </mxCell>
-        <mxCell id="oLJumqx1HHhM9YScGNT0-2" value="_buffer_drift( p_drift : Drift ) " style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;shadow=1;" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
-          <mxGeometry y="343" width="350" height="30" as="geometry" />
+        <mxCell id="wYuSwdfiTg43MnoHxwxG-0" value="clusters : dict[Cluster]" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontStyle=1" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
+          <mxGeometry y="66" width="290" height="26" as="geometry" />
         </mxCell>
-        <mxCell id="oLJumqx1HHhM9YScGNT0-3" value="_remove_drift( p_drift : Drift )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;shadow=1;" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
-          <mxGeometry y="373" width="350" height="30" as="geometry" />
+        <mxCell id="wYuSwdfiTg43MnoHxwxG-1" value="properties : dict" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontStyle=1" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
+          <mxGeometry y="92" width="290" height="26" as="geometry" />
         </mxCell>
-        <mxCell id="oLJumqx1HHhM9YScGNT0-4" value="_raise_drift_event( p_drift : Drift )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;shadow=1;" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
-          <mxGeometry y="403" width="350" height="30" as="geometry" />
+        <mxCell id="4use4ZCXdNiZSNTW99xv-20" value="" style="line;html=1;strokeWidth=1;align=center;verticalAlign=top;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;rounded=0;shadow=1;strokeColor=#6c8ebf;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;fontColor=default;fontStyle=1;fillColor=#dae8fc;gradientColor=#ffffff;" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
+          <mxGeometry y="118" width="290" height="8" as="geometry" />
         </mxCell>
-        <mxCell id="oLJumqx1HHhM9YScGNT0-5" value="init_plot( p_figure: Figure = None,&#xa;              p_plot_settings: PlotSettings = None)" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;shadow=1;" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
-          <mxGeometry y="433" width="350" height="43" as="geometry" />
+        <mxCell id="4use4ZCXdNiZSNTW99xv-21" value="__init__( p_drift_status : bool,&#xa;                p_id : int = 0,&#xa;                p_tstamp : datetime,&#xa;                p_visualise : bool = False,&#xa;                p_raising_object : object = None,&#xa;                p_clusters : dict[Cluster],&#xa;                p_properties : dict,&#xa;                **p_kwargs )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontStyle=1" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
+          <mxGeometry y="126" width="290" height="118" as="geometry" />
         </mxCell>
-        <mxCell id="oLJumqx1HHhM9YScGNT0-6" value="update_plot( p_inst: InstDict = None,&#xa;                     **p_kwargs )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;shadow=1;" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
-          <mxGeometry y="476" width="350" height="40" as="geometry" />
+        <mxCell id="QPhXRuD-ExfV2QrfVq-p-7" value="_init_plot_2d( p_figure: Figure, &#xa;                       p_settings : PlotSettings )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontColor=#FF0000;" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
+          <mxGeometry y="244" width="290" height="40" as="geometry" />
         </mxCell>
-        <mxCell id="oLJumqx1HHhM9YScGNT0-7" value="remove_plot(self, p_refresh: bool = True)" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;shadow=1;" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
-          <mxGeometry y="516" width="350" height="30" as="geometry" />
+        <mxCell id="QPhXRuD-ExfV2QrfVq-p-8" value="_init_plot_3d( p_figure: Figure, &#xa;                       p_settings : PlotSettings )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontColor=#FF0000;" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
+          <mxGeometry y="284" width="290" height="40" as="geometry" />
         </mxCell>
-        <mxCell id="4use4ZCXdNiZSNTW99xv-16" value="Drift&#xa;(bf.various.Id, bf.events.Event, bf.plot.Plottable)" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=40;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=1;strokeWidth=1;fillColor=#dae8fc;strokeColor=#6c8ebf;swimlaneFillColor=#ffffff;gradientColor=#ffffff;fontFamily=Helvetica;fontSize=12;fontColor=default;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="510" y="351" width="290" height="299" as="geometry">
+        <mxCell id="QPhXRuD-ExfV2QrfVq-p-20" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="QPhXRuD-ExfV2QrfVq-p-9" target="4use4ZCXdNiZSNTW99xv-16" edge="1">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="QPhXRuD-ExfV2QrfVq-p-9" value="DriftCBMovement&#xa;(DriftCB)" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=40;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=1;strokeWidth=1;fillColor=#f8cecc;strokeColor=#b85450;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;gradientColor=#FFFFFF;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="510" y="550" width="290" height="60" as="geometry">
             <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="8-Sli__s1YHfQ2Dl7trR-0" value="C_TYPE = &#39;Drift&#39;" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
-          <mxGeometry y="40" width="290" height="26" as="geometry" />
+        <mxCell id="QPhXRuD-ExfV2QrfVq-p-14" value="" style="line;html=1;strokeWidth=1;align=center;verticalAlign=top;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;rounded=0;shadow=1;strokeColor=#6c8ebf;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;fontColor=default;fontStyle=1;fillColor=#dae8fc;gradientColor=#ffffff;" parent="QPhXRuD-ExfV2QrfVq-p-9" vertex="1">
+          <mxGeometry y="40" width="290" height="8" as="geometry" />
         </mxCell>
-        <mxCell id="oLJumqx1HHhM9YScGNT0-24" value="C_PLOT_STANDALONE = False" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
-          <mxGeometry y="66" width="290" height="26" as="geometry" />
-        </mxCell>
-        <mxCell id="wYuSwdfiTg43MnoHxwxG-0" value="drift_status : bool" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontStyle=1" vertex="1" parent="4use4ZCXdNiZSNTW99xv-16">
-          <mxGeometry y="92" width="290" height="26" as="geometry" />
+        <mxCell id="gAn4k8T84J45JmDw8IqV-4" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="gAn4k8T84J45JmDw8IqV-0" target="4use4ZCXdNiZSNTW99xv-16" edge="1">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="1025" y="490" />
+              <mxPoint x="655" y="490" />
+            </Array>
+          </mxGeometry>
         </mxCell>
-        <mxCell id="wYuSwdfiTg43MnoHxwxG-1" value="event_id : str" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontStyle=1" vertex="1" parent="4use4ZCXdNiZSNTW99xv-16">
-          <mxGeometry y="118" width="290" height="26" as="geometry" />
+        <mxCell id="gAn4k8T84J45JmDw8IqV-0" value="DriftCBDeformation&#xa;(DriftCB)" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=40;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=1;strokeWidth=1;fillColor=#f8cecc;strokeColor=#b85450;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;gradientColor=#FFFFFF;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="880" y="550" width="290" height="60" as="geometry">
+            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
+          </mxGeometry>
         </mxCell>
-        <mxCell id="4use4ZCXdNiZSNTW99xv-20" value="" style="line;html=1;strokeWidth=1;align=center;verticalAlign=top;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;rounded=0;shadow=1;strokeColor=#6c8ebf;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;fontColor=default;fontStyle=1;fillColor=#dae8fc;gradientColor=#ffffff;" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
-          <mxGeometry y="144" width="290" height="8" as="geometry" />
+        <mxCell id="gAn4k8T84J45JmDw8IqV-1" value="" style="line;html=1;strokeWidth=1;align=center;verticalAlign=top;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;rounded=0;shadow=1;strokeColor=#6c8ebf;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;fontColor=default;fontStyle=1;fillColor=#dae8fc;gradientColor=#ffffff;" parent="gAn4k8T84J45JmDw8IqV-0" vertex="1">
+          <mxGeometry y="40" width="290" height="8" as="geometry" />
         </mxCell>
-        <mxCell id="4use4ZCXdNiZSNTW99xv-21" value="__init__( p_drift_status : bool,&#xa;                p_id : int = 0,&#xa;                p_tstamp : datetime,&#xa;                p_visualise : bool = False,&#xa;                p_raising_object : object = None,&#xa;                **p_kwargs )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontStyle=1" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
-          <mxGeometry y="152" width="290" height="96" as="geometry" />
+        <mxCell id="gAn4k8T84J45JmDw8IqV-5" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="gAn4k8T84J45JmDw8IqV-2" target="4use4ZCXdNiZSNTW99xv-16" edge="1">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="1395" y="490" />
+              <mxPoint x="655" y="490" />
+            </Array>
+          </mxGeometry>
         </mxCell>
-        <mxCell id="oLJumqx1HHhM9YScGNT0-29" value="_get_drift_status() -&gt; bool" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
-          <mxGeometry y="248" width="290" height="20" as="geometry" />
+        <mxCell id="gAn4k8T84J45JmDw8IqV-2" value="DriftCBSIze&#xa;(DriftCB)" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=40;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=1;strokeWidth=1;fillColor=#f8cecc;strokeColor=#b85450;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;gradientColor=#FFFFFF;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="1250" y="550" width="290" height="60" as="geometry">
+            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
+          </mxGeometry>
         </mxCell>
-        <mxCell id="hOcUKRqpv3udX4BvXm5B-9" value="_get_event_id() -&gt; str" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
-          <mxGeometry y="268" width="290" height="20" as="geometry" />
+        <mxCell id="gAn4k8T84J45JmDw8IqV-3" value="" style="line;html=1;strokeWidth=1;align=center;verticalAlign=top;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;rounded=0;shadow=1;strokeColor=#6c8ebf;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;fontColor=default;fontStyle=1;fillColor=#dae8fc;gradientColor=#ffffff;" parent="gAn4k8T84J45JmDw8IqV-2" vertex="1">
+          <mxGeometry y="40" width="290" height="8" as="geometry" />
         </mxCell>
       </root>
     </mxGraphModel>
   </diagram>
-  <diagram id="lryuDQluacSowWsRYUra" name="Page-2">
-    <mxGraphModel dx="1098" dy="828" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0">
-      <root>
-        <mxCell id="0" />
-        <mxCell id="1" parent="0" />
-      </root>
-    </mxGraphModel>
-  </diagram>
 </mxfile>
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/20_cluster_based/images/MLPro-OA-CB-Drift-Detectors_class_diagram.drawio b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/20_cluster_based/images/MLPro-OA-CB-Drift-Detectors_class_diagram.drawio
index 9249c1e80..dced91ced 100644
--- a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/20_cluster_based/images/MLPro-OA-CB-Drift-Detectors_class_diagram.drawio
+++ b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/20_cluster_based/images/MLPro-OA-CB-Drift-Detectors_class_diagram.drawio
@@ -1,6 +1,6 @@
-<mxfile host="Electron" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/26.0.9 Chrome/128.0.6613.186 Electron/32.2.5 Safari/537.36" version="26.0.9" pages="2">
+<mxfile host="Electron" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/26.0.16 Chrome/132.0.6834.196 Electron/34.2.0 Safari/537.36" version="26.0.16">
   <diagram id="C5RBs43oDa-KdzZeNtuy" name="Page-1">
-    <mxGraphModel dx="2403" dy="1031" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="2336" pageHeight="1654" math="0" shadow="0">
+    <mxGraphModel dx="2004" dy="1237" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="2336" pageHeight="1654" math="0" shadow="0">
       <root>
         <mxCell id="WIyWlLk6GJQsqaUBKTNV-0" />
         <mxCell id="WIyWlLk6GJQsqaUBKTNV-1" parent="WIyWlLk6GJQsqaUBKTNV-0" />
@@ -74,155 +74,75 @@
         <mxCell id="4use4ZCXdNiZSNTW99xv-6" value="__init__( p_clusterer : ClusterAnalyzer,&#xa;               p_name : str = None,&#xa;               p_range_max=OAStreamTask.C_RANGE_THREAD,&#xa;               p_ada : bool = True,&#xa;               p_duplicate_data : bool = False&#xa;               p_visualize : bool = False,&#xa;               p_logging = Log.C_LOG_ALL,&#xa;               **p_kwargs )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontStyle=1" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
           <mxGeometry y="124" width="350" height="126" as="geometry" />
         </mxCell>
-        <mxCell id="4use4ZCXdNiZSNTW99xv-16" value="DriftCB&#xa;(Drift)" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=40;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=1;strokeWidth=1;fillColor=#fff2cc;strokeColor=#d6b656;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;gradientColor=#F5F5F5;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="510" y="100" width="290" height="390" as="geometry">
+        <mxCell id="4use4ZCXdNiZSNTW99xv-16" value="DriftCB&#xa;(Drift)" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=40;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=1;strokeWidth=1;fillColor=#f8cecc;strokeColor=#b85450;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;gradientColor=#FFFFFF;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="510" y="100" width="290" height="330" as="geometry">
             <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="8-Sli__s1YHfQ2Dl7trR-0" value="C_TYPE = &#39;Cluster-based Drift&#39;" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
+        <mxCell id="oLJumqx1HHhM9YScGNT0-24" value="C_PLOT_ACTIVE = True" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
           <mxGeometry y="40" width="290" height="26" as="geometry" />
         </mxCell>
-        <mxCell id="oLJumqx1HHhM9YScGNT0-24" value="C_PLOT_ACTIVE = True" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
+        <mxCell id="wYuSwdfiTg43MnoHxwxG-0" value="clusters : dict[Cluster]" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontStyle=1" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
           <mxGeometry y="66" width="290" height="26" as="geometry" />
         </mxCell>
-        <mxCell id="wYuSwdfiTg43MnoHxwxG-0" value="_clusters : dict[Cluster]" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontStyle=0" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
+        <mxCell id="wYuSwdfiTg43MnoHxwxG-1" value="properties : dict" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontStyle=1" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
           <mxGeometry y="92" width="290" height="26" as="geometry" />
         </mxCell>
-        <mxCell id="wYuSwdfiTg43MnoHxwxG-1" value="_properties : dict" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontStyle=0" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
-          <mxGeometry y="118" width="290" height="26" as="geometry" />
-        </mxCell>
         <mxCell id="4use4ZCXdNiZSNTW99xv-20" value="" style="line;html=1;strokeWidth=1;align=center;verticalAlign=top;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;rounded=0;shadow=1;strokeColor=#6c8ebf;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;fontColor=default;fontStyle=1;fillColor=#dae8fc;gradientColor=#ffffff;" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
-          <mxGeometry y="144" width="290" height="8" as="geometry" />
+          <mxGeometry y="118" width="290" height="8" as="geometry" />
         </mxCell>
         <mxCell id="4use4ZCXdNiZSNTW99xv-21" value="__init__( p_drift_status : bool,&#xa;                p_id : int = 0,&#xa;                p_tstamp : datetime,&#xa;                p_visualise : bool = False,&#xa;                p_raising_object : object = None,&#xa;                p_clusters : dict[Cluster],&#xa;                p_properties : dict,&#xa;                **p_kwargs )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontStyle=1" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
-          <mxGeometry y="152" width="290" height="118" as="geometry" />
-        </mxCell>
-        <mxCell id="oLJumqx1HHhM9YScGNT0-29" value="get_clusters() -&gt; dict[Cluster]" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
-          <mxGeometry y="270" width="290" height="20" as="geometry" />
-        </mxCell>
-        <mxCell id="hOcUKRqpv3udX4BvXm5B-9" value="get_properties() -&gt; dict" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
-          <mxGeometry y="290" width="290" height="20" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-7" value="_init_plot_2d( p_figure: Figure, &#xa;                       p_settings : PlotSettings )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontColor=#FF0000;" vertex="1" parent="4use4ZCXdNiZSNTW99xv-16">
-          <mxGeometry y="310" width="290" height="40" as="geometry" />
+          <mxGeometry y="126" width="290" height="118" as="geometry" />
         </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-8" value="_init_plot_3d( p_figure: Figure, &#xa;                       p_settings : PlotSettings )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontColor=#FF0000;" vertex="1" parent="4use4ZCXdNiZSNTW99xv-16">
-          <mxGeometry y="350" width="290" height="40" as="geometry" />
+        <mxCell id="QPhXRuD-ExfV2QrfVq-p-7" value="_init_plot_2d( p_figure: Figure, &#xa;                       p_settings : PlotSettings )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontColor=#FF0000;" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
+          <mxGeometry y="244" width="290" height="40" as="geometry" />
         </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-6" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="QPhXRuD-ExfV2QrfVq-p-0" target="4use4ZCXdNiZSNTW99xv-1">
-          <mxGeometry relative="1" as="geometry" />
+        <mxCell id="QPhXRuD-ExfV2QrfVq-p-8" value="_init_plot_3d( p_figure: Figure, &#xa;                       p_settings : PlotSettings )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontColor=#FF0000;" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
+          <mxGeometry y="284" width="290" height="40" as="geometry" />
         </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-21" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=1;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="QPhXRuD-ExfV2QrfVq-p-0" target="QPhXRuD-ExfV2QrfVq-p-9">
+        <mxCell id="QPhXRuD-ExfV2QrfVq-p-20" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="QPhXRuD-ExfV2QrfVq-p-9" target="4use4ZCXdNiZSNTW99xv-16" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-0" value="DriftDetectorCBMovement&#xa;(DriftDetectorCB)" style="swimlane;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=41;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=1;strokeWidth=1;fillColor=#f8cecc;strokeColor=#b85450;swimlaneFillColor=#ffffff;gradientColor=#F5F5F5;" vertex="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
-          <mxGeometry x="40" y="600" width="350" height="912" as="geometry">
+        <mxCell id="QPhXRuD-ExfV2QrfVq-p-9" value="DriftCBMovement&#xa;(DriftCB)" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=40;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=1;strokeWidth=1;fillColor=#f8cecc;strokeColor=#b85450;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;gradientColor=#FFFFFF;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="510" y="550" width="290" height="60" as="geometry">
             <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-1" value="C_TYPE = &#39;Cluster-based Drift Detector&#39;" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="41" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-2" value="C_REQ_CLUSTER_PROPERTIES : PropertyDefinitions &#xa;           = [ cprop_centroid2 ]" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="65" width="350" height="40" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-31" value="_inst_change_det : bool" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="105" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-32" value="_inst_state_det : bool" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="129" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-33" value="_min_vel_thresh : float" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="153" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-34" value="_buffer_size" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="177" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-35" value="_ema_alpha : float" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="201" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-36" value="_with_time_calculation : bool" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="225" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-37" value="_init_skip : int" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="249" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-38" value="_count : int" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="273" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-39" value="_count_change : dict" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="297" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-40" value="_centroids_history : dict" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="321" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-41" value="_times_history : dict" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="345" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-42" value="_velocities_history : dict" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="369" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-43" value="_accelerations_history : dict" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="393" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-44" value="_cluster_states : dict" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="417" width="350" height="24" as="geometry" />
+        <mxCell id="QPhXRuD-ExfV2QrfVq-p-14" value="" style="line;html=1;strokeWidth=1;align=center;verticalAlign=top;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;rounded=0;shadow=1;strokeColor=#6c8ebf;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;fontColor=default;fontStyle=1;fillColor=#dae8fc;gradientColor=#ffffff;" parent="QPhXRuD-ExfV2QrfVq-p-9" vertex="1">
+          <mxGeometry y="40" width="290" height="8" as="geometry" />
         </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-4" value="" style="line;html=1;strokeWidth=1;align=center;verticalAlign=top;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;rounded=0;shadow=1;strokeColor=#6c8ebf;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;fontColor=default;fontStyle=3;fillColor=#dae8fc;gradientColor=#ffffff;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="441" width="350" height="8" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-5" value="__init__( &#xa;  p_clusterer : ClusterAnalyzer,&#xa;  p_instantaneous_velocity_change_detection : bool = True,&#xa;  p_min_velocity_threshoold : float = 0.01,&#xa;  p_state_change_detection : bool = False,&#xa;  p_min_acceleration_threshold : float = None,&#xa;  p_buffer_size = 5,&#xa;  p_ema_alpha : float = 0.7,&#xa;  p_with_time_calculation : bool = True,&#xa;  p_initial_skip : int = 1,&#xa;  p_name : str = None,&#xa;  p_range_max=OAStreamTask.C_RANGE_THREAD,&#xa;  p_ada : bool = True,&#xa;  p_duplicate_data : bool = False&#xa;  p_visualize : bool = False,&#xa;  p_logging = Log.C_LOG_ALL,&#xa;  **p_kwargs )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontStyle=1" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="449" width="350" height="247" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-22" value="_run( p_inst : InstDict )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontColor=#FF0000;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="696" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-23" value="_initialize_cluster( ... )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontColor=#FF0000;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="720" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-24" value="_calculate_velocity( ... )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontColor=#FF0000;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="744" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-25" value="_calculate_acceleration( ... )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontColor=#FF0000;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="768" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-26" value="_inst_vel_change_detection( ... )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontColor=#FF0000;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="792" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-27" value="_calculate_ema( ... )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontColor=#FF0000;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="816" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-28" value="_detect_state_change( ... )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontColor=#FF0000;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="840" width="350" height="24" as="geometry" />
+        <mxCell id="gAn4k8T84J45JmDw8IqV-4" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="gAn4k8T84J45JmDw8IqV-0" target="4use4ZCXdNiZSNTW99xv-16" edge="1">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="1025" y="490" />
+              <mxPoint x="655" y="490" />
+            </Array>
+          </mxGeometry>
         </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-29" value="get_velocities() " style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontColor=#FF0000;fontStyle=1" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="864" width="350" height="24" as="geometry" />
+        <mxCell id="gAn4k8T84J45JmDw8IqV-0" value="DriftCBDeformation&#xa;(DriftCB)" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=40;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=1;strokeWidth=1;fillColor=#f8cecc;strokeColor=#b85450;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;gradientColor=#FFFFFF;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="880" y="550" width="290" height="60" as="geometry">
+            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
+          </mxGeometry>
         </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-30" value="get_accelerations()" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontColor=#FF0000;fontStyle=1" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-0">
-          <mxGeometry y="888" width="350" height="24" as="geometry" />
+        <mxCell id="gAn4k8T84J45JmDw8IqV-1" value="" style="line;html=1;strokeWidth=1;align=center;verticalAlign=top;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;rounded=0;shadow=1;strokeColor=#6c8ebf;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;fontColor=default;fontStyle=1;fillColor=#dae8fc;gradientColor=#ffffff;" parent="gAn4k8T84J45JmDw8IqV-0" vertex="1">
+          <mxGeometry y="40" width="290" height="8" as="geometry" />
         </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-20" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="QPhXRuD-ExfV2QrfVq-p-9" target="4use4ZCXdNiZSNTW99xv-16">
-          <mxGeometry relative="1" as="geometry" />
+        <mxCell id="gAn4k8T84J45JmDw8IqV-5" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="gAn4k8T84J45JmDw8IqV-2" target="4use4ZCXdNiZSNTW99xv-16" edge="1">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="1395" y="490" />
+              <mxPoint x="655" y="490" />
+            </Array>
+          </mxGeometry>
         </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-9" value="DriftCBMovement&#xa;(DriftCB)" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=40;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=1;strokeWidth=1;fillColor=#fff2cc;strokeColor=#d6b656;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;gradientColor=#F5F5F5;" vertex="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
-          <mxGeometry x="510" y="600" width="290" height="90" as="geometry">
+        <mxCell id="gAn4k8T84J45JmDw8IqV-2" value="DriftCBSIze&#xa;(DriftCB)" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=40;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=1;strokeWidth=1;fillColor=#f8cecc;strokeColor=#b85450;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;gradientColor=#FFFFFF;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="1250" y="550" width="290" height="60" as="geometry">
             <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-10" value="C_TYPE = &#39;Cluster-based Drift (Movement)&#39;" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-9">
-          <mxGeometry y="40" width="290" height="26" as="geometry" />
+        <mxCell id="gAn4k8T84J45JmDw8IqV-3" value="" style="line;html=1;strokeWidth=1;align=center;verticalAlign=top;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;rounded=0;shadow=1;strokeColor=#6c8ebf;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;fontColor=default;fontStyle=1;fillColor=#dae8fc;gradientColor=#ffffff;" parent="gAn4k8T84J45JmDw8IqV-2" vertex="1">
+          <mxGeometry y="40" width="290" height="8" as="geometry" />
         </mxCell>
-        <mxCell id="QPhXRuD-ExfV2QrfVq-p-14" value="" style="line;html=1;strokeWidth=1;align=center;verticalAlign=top;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;rounded=0;shadow=1;strokeColor=#6c8ebf;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;fontColor=default;fontStyle=1;fillColor=#dae8fc;gradientColor=#ffffff;" vertex="1" parent="QPhXRuD-ExfV2QrfVq-p-9">
-          <mxGeometry y="66" width="290" height="8" as="geometry" />
-        </mxCell>
-      </root>
-    </mxGraphModel>
-  </diagram>
-  <diagram id="lryuDQluacSowWsRYUra" name="Page-2">
-    <mxGraphModel dx="1098" dy="828" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0">
-      <root>
-        <mxCell id="0" />
-        <mxCell id="1" parent="0" />
       </root>
     </mxGraphModel>
   </diagram>
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/20_cluster_based/images/MLPro-OA-CB-Drift-Detectors_class_diagram.drawio.png b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/20_cluster_based/images/MLPro-OA-CB-Drift-Detectors_class_diagram.drawio.png
new file mode 100644
index 000000000..b9dc687e3
Binary files /dev/null and b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/20_cluster_based/images/MLPro-OA-CB-Drift-Detectors_class_diagram.drawio.png differ
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/images/.$MLPro-OA-Drift-Detectors_class_diagram.drawio.bkp b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/images/.$MLPro-OA-Drift-Detectors_class_diagram.drawio.bkp
new file mode 100644
index 000000000..2f0a97ac1
--- /dev/null
+++ b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/images/.$MLPro-OA-Drift-Detectors_class_diagram.drawio.bkp
@@ -0,0 +1,139 @@
+<mxfile host="Electron" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/26.0.16 Chrome/132.0.6834.196 Electron/34.2.0 Safari/537.36" version="26.0.16">
+  <diagram id="C5RBs43oDa-KdzZeNtuy" name="Page-1">
+    <mxGraphModel dx="2004" dy="1237" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="2336" pageHeight="1654" math="0" shadow="0">
+      <root>
+        <mxCell id="WIyWlLk6GJQsqaUBKTNV-0" />
+        <mxCell id="WIyWlLk6GJQsqaUBKTNV-1" parent="WIyWlLk6GJQsqaUBKTNV-0" />
+        <mxCell id="fcJVb3HREh7NScvAmxeq-0" value="" style="group" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1" connectable="0">
+          <mxGeometry x="520" y="40" width="490" height="220" as="geometry" />
+        </mxCell>
+        <mxCell id="fcJVb3HREh7NScvAmxeq-1" value="&lt;font color=&quot;#000000&quot; size=&quot;1&quot;&gt;&lt;b style=&quot;font-size: 14px&quot;&gt;Legend:&lt;br&gt;&lt;/b&gt;&lt;/font&gt;&lt;br&gt;&lt;br&gt;&lt;br&gt;&lt;font color=&quot;#0000ff&quot; style=&quot;font-size: 6px&quot;&gt;&lt;br&gt;&lt;/font&gt;&lt;span style=&quot;color: rgb(0 , 0 , 0)&quot;&gt;&lt;font style=&quot;font-size: 4px&quot;&gt;&amp;nbsp; &amp;nbsp;&lt;/font&gt;&amp;nbsp;In progress&amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp; In validation&amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp;Ready to use&lt;/span&gt;&lt;font color=&quot;#000000&quot;&gt;&amp;nbsp;&lt;br&gt;&lt;/font&gt;&lt;font color=&quot;#0000ff&quot;&gt;&lt;br&gt;&lt;br&gt;&lt;br&gt;&lt;br&gt;&amp;nbsp;attribute / method()&amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp; New public attribute/method to be implemented&lt;/font&gt;&lt;br&gt;&lt;font color=&quot;#000000&quot;&gt;&amp;nbsp;&lt;/font&gt;&lt;font color=&quot;#000000&quot;&gt;attribute / method()&lt;span&gt; &lt;/span&gt;&amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp;New/inherited public attribute/method that is implemented here&lt;br&gt;&lt;/font&gt;&lt;font color=&quot;#0000ff&quot;&gt;&amp;nbsp;_attribute /&amp;nbsp;&lt;/font&gt;&lt;font color=&quot;#0000ff&quot;&gt;_method()&amp;nbsp; &amp;nbsp; New protected method/attribute to be implemented&lt;/font&gt;&lt;br&gt;&lt;font color=&quot;#000000&quot;&gt;&amp;nbsp;_attribute / _method()&amp;nbsp; &amp;nbsp; New/inherited protected attribute/method that is implemented here&lt;br&gt;&lt;/font&gt;&lt;font color=&quot;#000000&quot;&gt;&lt;br&gt;&lt;br&gt;&lt;br&gt;&lt;br&gt;&lt;br&gt;&lt;/font&gt;" style="text;html=1;align=left;verticalAlign=top;whiteSpace=wrap;rounded=0;fontColor=#006600;strokeColor=#000000;shadow=1;fillColor=#ffffff;" parent="fcJVb3HREh7NScvAmxeq-0" vertex="1">
+          <mxGeometry width="489.99999999999994" height="220" as="geometry" />
+        </mxCell>
+        <mxCell id="fcJVb3HREh7NScvAmxeq-2" value="Depends on" style="endArrow=block;html=1;labelPosition=right;verticalLabelPosition=middle;align=left;verticalAlign=middle;endFill=1;fontSize=12;" parent="fcJVb3HREh7NScvAmxeq-0" edge="1">
+          <mxGeometry x="-1623.1249999999998" y="-2180" width="51.041666666666664" height="50" as="geometry">
+            <mxPoint x="10.20802398989899" y="120.00301587301601" as="sourcePoint" />
+            <mxPoint x="55.990852272727174" y="120.00301587301601" as="targetPoint" />
+            <mxPoint x="98" as="offset" />
+            <Array as="points">
+              <mxPoint x="30.624999999999996" y="120" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="fcJVb3HREh7NScvAmxeq-3" value="Inherits from" style="endArrow=block;html=1;labelPosition=right;verticalLabelPosition=middle;align=left;verticalAlign=middle;endFill=0;fontSize=12;" parent="fcJVb3HREh7NScvAmxeq-0" edge="1">
+          <mxGeometry x="-1623.1249999999998" y="-2180" width="51.041666666666664" height="50" as="geometry">
+            <mxPoint x="10.20802398989899" y="132.3846031746034" as="sourcePoint" />
+            <mxPoint x="55.990852272727174" y="132.3846031746034" as="targetPoint" />
+            <mxPoint x="98" y="1" as="offset" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="fcJVb3HREh7NScvAmxeq-4" value="" style="swimlane;fontStyle=3;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=1;strokeWidth=1;fillColor=#f8cecc;strokeColor=#b85450;gradientColor=#ffffff;swimlaneFillColor=#ffffff;" parent="fcJVb3HREh7NScvAmxeq-0" vertex="1">
+          <mxGeometry x="10.208333333333332" y="40" width="40.83333333333333" height="34" as="geometry">
+            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="fcJVb3HREh7NScvAmxeq-5" value="" style="line;html=1;strokeWidth=1;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;" parent="fcJVb3HREh7NScvAmxeq-4" vertex="1">
+          <mxGeometry y="26" width="40.83333333333333" height="8" as="geometry" />
+        </mxCell>
+        <mxCell id="fcJVb3HREh7NScvAmxeq-6" value="" style="swimlane;fontStyle=3;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=1;strokeWidth=1;fillColor=#fff2cc;strokeColor=#d6b656;gradientColor=#ffffff;swimlaneFillColor=#ffffff;" parent="fcJVb3HREh7NScvAmxeq-0" vertex="1">
+          <mxGeometry x="112.29166666666666" y="40" width="40.83333333333333" height="34" as="geometry">
+            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="fcJVb3HREh7NScvAmxeq-7" value="" style="line;html=1;strokeWidth=1;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;" parent="fcJVb3HREh7NScvAmxeq-6" vertex="1">
+          <mxGeometry y="26" width="40.83333333333333" height="8" as="geometry" />
+        </mxCell>
+        <mxCell id="fcJVb3HREh7NScvAmxeq-8" value="" style="swimlane;fontStyle=3;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=1;strokeWidth=1;fillColor=#dae8fc;strokeColor=#6c8ebf;gradientColor=#ffffff;swimlaneFillColor=#ffffff;" parent="fcJVb3HREh7NScvAmxeq-0" vertex="1">
+          <mxGeometry x="214.37499999999997" y="40" width="40.83333333333333" height="34" as="geometry">
+            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="fcJVb3HREh7NScvAmxeq-9" value="" style="line;html=1;strokeWidth=1;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;" parent="fcJVb3HREh7NScvAmxeq-8" vertex="1">
+          <mxGeometry y="26" width="40.83333333333333" height="8" as="geometry" />
+        </mxCell>
+        <mxCell id="0cJ1NAXk0Xtcf3CmwPfC-0" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="4use4ZCXdNiZSNTW99xv-1" target="4use4ZCXdNiZSNTW99xv-16" edge="1">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="4use4ZCXdNiZSNTW99xv-1" value="DriftDetector&#xa;(OATask)" style="swimlane;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=41;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=1;strokeWidth=1;fillColor=#dae8fc;strokeColor=#6c8ebf;swimlaneFillColor=#ffffff;gradientColor=#FFFFFF;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="40" y="90" width="350" height="588" as="geometry">
+            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="4use4ZCXdNiZSNTW99xv-2" value="C_TYPE                                           = &#39;Drift Detector&#39;" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
+          <mxGeometry y="41" width="350" height="24" as="geometry" />
+        </mxCell>
+        <mxCell id="oLJumqx1HHhM9YScGNT0-0" value="C_PLOT_ACTIVE &amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp; &lt;span style=&quot;white-space: pre;&quot;&gt;&#x9;&lt;/span&gt;&lt;span style=&quot;white-space: pre;&quot;&gt;&#x9;&lt;/span&gt;&amp;nbsp;= True" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;html=1;" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
+          <mxGeometry y="65" width="350" height="26" as="geometry" />
+        </mxCell>
+        <mxCell id="iRqbgX-deYLXcJWkZiLP-0" value="C_PLOT_STANDALONE                 = False" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
+          <mxGeometry y="91" width="350" height="24" as="geometry" />
+        </mxCell>
+        <mxCell id="wYuSwdfiTg43MnoHxwxG-3" value="_drift_id : int" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
+          <mxGeometry y="115" width="350" height="25" as="geometry" />
+        </mxCell>
+        <mxCell id="BMesHA9r62g8xTuoOKwh-0" value="_drift_buffer_size : int" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
+          <mxGeometry y="140" width="350" height="25" as="geometry" />
+        </mxCell>
+        <mxCell id="wYuSwdfiTg43MnoHxwxG-2" value="drifts : Dict[Drift]" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontStyle=1" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
+          <mxGeometry y="165" width="350" height="26" as="geometry" />
+        </mxCell>
+        <mxCell id="4use4ZCXdNiZSNTW99xv-5" value="" style="line;html=1;strokeWidth=1;align=center;verticalAlign=top;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;rounded=0;shadow=1;strokeColor=#6c8ebf;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;fontColor=default;fontStyle=3;fillColor=#dae8fc;gradientColor=#ffffff;" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
+          <mxGeometry y="191" width="350" height="8" as="geometry" />
+        </mxCell>
+        <mxCell id="4use4ZCXdNiZSNTW99xv-6" value="__init__( p_name : str = None,&#xa;               p_range_max=OAStreamTask.C_RANGE_THREAD,&#xa;               p_ada : bool = True,&#xa;               p_duplicate_data : bool = False&#xa;               p_visualize : bool = False,&#xa;               p_logging = Log.C_LOG_ALL,&#xa;               p_drift_buffer_size : int = 100,&#xa;               **p_kwargs )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontStyle=1" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
+          <mxGeometry y="199" width="350" height="126" as="geometry" />
+        </mxCell>
+        <mxCell id="N38WU9mJ-Era6qwWuLtT-0" value="_get_next_drift_id() -&gt; int" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;shadow=1;" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
+          <mxGeometry y="325" width="350" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="oLJumqx1HHhM9YScGNT0-2" value="_buffer_drift( p_drift : Drift ) " style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;shadow=1;" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
+          <mxGeometry y="355" width="350" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="oLJumqx1HHhM9YScGNT0-3" value="_remove_drift( p_drift : Drift )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;shadow=1;" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
+          <mxGeometry y="385" width="350" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="oLJumqx1HHhM9YScGNT0-4" value="_raise_drift_event( p_drift : Drift, p_buffer: bool = True )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;shadow=1;fontStyle=1" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
+          <mxGeometry y="415" width="350" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="oLJumqx1HHhM9YScGNT0-5" value="init_plot( p_figure: Figure = None,&#xa;              p_plot_settings: PlotSettings = None)" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;shadow=1;" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
+          <mxGeometry y="445" width="350" height="43" as="geometry" />
+        </mxCell>
+        <mxCell id="oLJumqx1HHhM9YScGNT0-6" value="update_plot( p_inst: InstDict = None,&#xa;                     **p_kwargs )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;shadow=1;" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
+          <mxGeometry y="488" width="350" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="oLJumqx1HHhM9YScGNT0-7" value="remove_plot(self, p_refresh: bool = True)" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;shadow=1;" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
+          <mxGeometry y="528" width="350" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="Y-8jKH3KwL4r67y5zE4n-0" value="renormalize(p_normalizer: Normalizer) " style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;shadow=1;fontStyle=0" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
+          <mxGeometry y="558" width="350" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="4use4ZCXdNiZSNTW99xv-16" value="Drift&#xa;(bf.various.Id, bf.events.Event, bf.plot.Plottable)" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=40;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=1;strokeWidth=1;fillColor=#dae8fc;strokeColor=#6c8ebf;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;gradientColor=#FFFFFF;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="520" y="407" width="290" height="271" as="geometry">
+            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="oLJumqx1HHhM9YScGNT0-24" value="C_PLOT_STANDALONE = False" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
+          <mxGeometry y="40" width="290" height="26" as="geometry" />
+        </mxCell>
+        <mxCell id="wYuSwdfiTg43MnoHxwxG-0" value="drift_status : bool" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontStyle=1" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
+          <mxGeometry y="66" width="290" height="26" as="geometry" />
+        </mxCell>
+        <mxCell id="wYuSwdfiTg43MnoHxwxG-1" value="event_id : str" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontStyle=1" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
+          <mxGeometry y="92" width="290" height="26" as="geometry" />
+        </mxCell>
+        <mxCell id="4use4ZCXdNiZSNTW99xv-20" value="" style="line;html=1;strokeWidth=1;align=center;verticalAlign=top;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;rounded=0;shadow=1;strokeColor=#6c8ebf;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;fontColor=default;fontStyle=1;fillColor=#dae8fc;gradientColor=#ffffff;" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
+          <mxGeometry y="118" width="290" height="8" as="geometry" />
+        </mxCell>
+        <mxCell id="4use4ZCXdNiZSNTW99xv-21" value="__init__( p_drift_status : bool,&#xa;                p_id : int = 0,&#xa;                p_tstamp : datetime,&#xa;                p_visualise : bool = False,&#xa;                p_raising_object : object = None,&#xa;                **p_kwargs )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontStyle=1" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
+          <mxGeometry y="126" width="290" height="96" as="geometry" />
+        </mxCell>
+        <mxCell id="oLJumqx1HHhM9YScGNT0-29" value="_get_drift_status() -&gt; bool" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
+          <mxGeometry y="222" width="290" height="20" as="geometry" />
+        </mxCell>
+        <mxCell id="hOcUKRqpv3udX4BvXm5B-9" value="_get_event_id() -&gt; str" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
+          <mxGeometry y="242" width="290" height="20" as="geometry" />
+        </mxCell>
+      </root>
+    </mxGraphModel>
+  </diagram>
+</mxfile>
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/images/MLPro-OA-Drift-Detectors_class_diagram.drawio b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/images/MLPro-OA-Drift-Detectors_class_diagram.drawio
index 08c9efd0d..2f0a97ac1 100644
--- a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/images/MLPro-OA-Drift-Detectors_class_diagram.drawio
+++ b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/images/MLPro-OA-Drift-Detectors_class_diagram.drawio
@@ -1,6 +1,6 @@
 <mxfile host="Electron" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/26.0.16 Chrome/132.0.6834.196 Electron/34.2.0 Safari/537.36" version="26.0.16">
   <diagram id="C5RBs43oDa-KdzZeNtuy" name="Page-1">
-    <mxGraphModel dx="2884" dy="1237" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="2336" pageHeight="1654" math="0" shadow="0">
+    <mxGraphModel dx="2004" dy="1237" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="2336" pageHeight="1654" math="0" shadow="0">
       <root>
         <mxCell id="WIyWlLk6GJQsqaUBKTNV-0" />
         <mxCell id="WIyWlLk6GJQsqaUBKTNV-1" parent="WIyWlLk6GJQsqaUBKTNV-0" />
@@ -104,37 +104,34 @@
         <mxCell id="oLJumqx1HHhM9YScGNT0-7" value="remove_plot(self, p_refresh: bool = True)" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;shadow=1;" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
           <mxGeometry y="528" width="350" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="Y-8jKH3KwL4r67y5zE4n-0" value="renormalize(p_normalizer: Normalizer) " style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;shadow=1;fontStyle=0" vertex="1" parent="4use4ZCXdNiZSNTW99xv-1">
+        <mxCell id="Y-8jKH3KwL4r67y5zE4n-0" value="renormalize(p_normalizer: Normalizer) " style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;shadow=1;fontStyle=0" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
           <mxGeometry y="558" width="350" height="30" as="geometry" />
         </mxCell>
         <mxCell id="4use4ZCXdNiZSNTW99xv-16" value="Drift&#xa;(bf.various.Id, bf.events.Event, bf.plot.Plottable)" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=40;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=1;strokeWidth=1;fillColor=#dae8fc;strokeColor=#6c8ebf;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;gradientColor=#FFFFFF;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="520" y="379" width="290" height="299" as="geometry">
+          <mxGeometry x="520" y="407" width="290" height="271" as="geometry">
             <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="8-Sli__s1YHfQ2Dl7trR-0" value="C_TYPE = &#39;Drift&#39;" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
-          <mxGeometry y="40" width="290" height="26" as="geometry" />
-        </mxCell>
         <mxCell id="oLJumqx1HHhM9YScGNT0-24" value="C_PLOT_STANDALONE = False" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
-          <mxGeometry y="66" width="290" height="26" as="geometry" />
+          <mxGeometry y="40" width="290" height="26" as="geometry" />
         </mxCell>
         <mxCell id="wYuSwdfiTg43MnoHxwxG-0" value="drift_status : bool" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontStyle=1" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
-          <mxGeometry y="92" width="290" height="26" as="geometry" />
+          <mxGeometry y="66" width="290" height="26" as="geometry" />
         </mxCell>
         <mxCell id="wYuSwdfiTg43MnoHxwxG-1" value="event_id : str" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontStyle=1" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
-          <mxGeometry y="118" width="290" height="26" as="geometry" />
+          <mxGeometry y="92" width="290" height="26" as="geometry" />
         </mxCell>
         <mxCell id="4use4ZCXdNiZSNTW99xv-20" value="" style="line;html=1;strokeWidth=1;align=center;verticalAlign=top;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;rounded=0;shadow=1;strokeColor=#6c8ebf;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;fontColor=default;fontStyle=1;fillColor=#dae8fc;gradientColor=#ffffff;" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
-          <mxGeometry y="144" width="290" height="8" as="geometry" />
+          <mxGeometry y="118" width="290" height="8" as="geometry" />
         </mxCell>
         <mxCell id="4use4ZCXdNiZSNTW99xv-21" value="__init__( p_drift_status : bool,&#xa;                p_id : int = 0,&#xa;                p_tstamp : datetime,&#xa;                p_visualise : bool = False,&#xa;                p_raising_object : object = None,&#xa;                **p_kwargs )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontStyle=1" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
-          <mxGeometry y="152" width="290" height="96" as="geometry" />
+          <mxGeometry y="126" width="290" height="96" as="geometry" />
         </mxCell>
         <mxCell id="oLJumqx1HHhM9YScGNT0-29" value="_get_drift_status() -&gt; bool" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
-          <mxGeometry y="248" width="290" height="20" as="geometry" />
+          <mxGeometry y="222" width="290" height="20" as="geometry" />
         </mxCell>
         <mxCell id="hOcUKRqpv3udX4BvXm5B-9" value="_get_event_id() -&gt; str" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1">
-          <mxGeometry y="268" width="290" height="20" as="geometry" />
+          <mxGeometry y="242" width="290" height="20" as="geometry" />
         </mxCell>
       </root>
     </mxGraphModel>
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/images/MLPro-OA-Drift-Detectors_class_diagram.drawio.png b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/images/MLPro-OA-Drift-Detectors_class_diagram.drawio.png
index eff45b727..fc0a38318 100644
Binary files a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/images/MLPro-OA-Drift-Detectors_class_diagram.drawio.png and b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/images/MLPro-OA-Drift-Detectors_class_diagram.drawio.png differ
diff --git a/src/mlpro/oa/streams/tasks/driftdetectors/clusterbased/basics.py b/src/mlpro/oa/streams/tasks/driftdetectors/clusterbased/basics.py
index 6f0dc275b..0e5e06366 100644
--- a/src/mlpro/oa/streams/tasks/driftdetectors/clusterbased/basics.py
+++ b/src/mlpro/oa/streams/tasks/driftdetectors/clusterbased/basics.py
@@ -11,7 +11,7 @@
 """
 Ver. 0.1.0 (2025-02-12)
 
-This module provides template for cluster-based drift detection algorithms to be used in the context of online adaptivity.
+This module provides a template for cluster-based drift detection algorithms to be used in the context of online adaptivity.
 """
 
 from mlpro.bf.various import Log
diff --git a/src/mlpro/oa/streams/tasks/driftdetectors/drifts/basics.py b/src/mlpro/oa/streams/tasks/driftdetectors/drifts/basics.py
index 7b068a888..a07f3536f 100644
--- a/src/mlpro/oa/streams/tasks/driftdetectors/drifts/basics.py
+++ b/src/mlpro/oa/streams/tasks/driftdetectors/drifts/basics.py
@@ -54,7 +54,6 @@ class Drift (Id, Event, Plottable, Renormalizable):
         class name and one of the postfixes '(ON)', '(OFF)' depending on the drift status.
     """
 
-    C_TYPE            = 'Drift'
     C_PLOT_STANDALONE = False
 
 ## -------------------------------------------------------------------------------------------------
diff --git a/src/mlpro/oa/streams/tasks/driftdetectors/drifts/clusterbased/basics.py b/src/mlpro/oa/streams/tasks/driftdetectors/drifts/clusterbased/basics.py
index 2b79382a2..e960da98a 100644
--- a/src/mlpro/oa/streams/tasks/driftdetectors/drifts/clusterbased/basics.py
+++ b/src/mlpro/oa/streams/tasks/driftdetectors/drifts/clusterbased/basics.py
@@ -5,11 +5,12 @@
 ## -------------------------------------------------------------------------------------------------
 ## -- History :
 ## -- yyyy-mm-dd  Ver.      Auth.    Description
-## -- 2025-02-12  1.0.0     DA       Creation
+## -- 2025-02-12  0.1.0     DA       Creation
+## -- 2025-03-04  0.2.0     DA       Simplification
 ## -------------------------------------------------------------------------------------------------
 
 """
-Ver. 0.1.0 (2025-02-12)
+Ver. 0.2.0 (2025-03-04)
 
 This module provides a template class for cluster-based drifts to be used in cluster-based drift 
 detection algorithms.
@@ -72,43 +73,17 @@ def __init__(self,
                           p_raising_object = p_raising_object,
                           **p_kwargs )
         
-        self._clusters : dict[Cluster] = p_clusters
-        self._properties : dict = p_properties
+        self.clusters : dict[Cluster] = p_clusters
+        self.properties : dict = p_properties
 
 
-## -------------------------------------------------------------------------------------------------
-    def get_clusters(self) -> dict[Cluster]:
-        """
-        Method that returns the clusters associated with the drift.
-        
-        Returns
-        -------
-        dict[Cluster]
-            Dictionary of clusters.
-        """
-        return self._clusters
-    
-
-## -------------------------------------------------------------------------------------------------
-    def get_properties(self) -> dict:
-        """
-        Method that returns the properties of clusters associated with the drift.
-        
-        Returns
-        -------
-        dict
-            Dictionary of properties.
-        """
-        return self._properties
-    
-
 ## -------------------------------------------------------------------------------------------------
     def _init_plot_2d(self, p_figure: Figure, p_settings: PlotSettings):
         super()._init_plot_2d(p_figure=p_figure, p_settings=p_settings)
 
         cluster : Cluster = None
 
-        for cluster in self._clusters.values(): 
+        for cluster in self.clusters.values(): 
             if self.drift_status:
                 cluster.color = "red"
             else:
@@ -121,7 +96,7 @@ def _init_plot_3d(self, p_figure: Figure, p_settings: PlotSettings):
     
         cluster : Cluster = None
 
-        for cluster in self._clusters.values(): 
+        for cluster in self.clusters.values(): 
             if self.drift_status:
                 cluster.color = "red"
             else:
diff --git a/src/mlpro/oa/streams/tasks/driftdetectors/drifts/instancebased/basics.py b/src/mlpro/oa/streams/tasks/driftdetectors/drifts/instancebased/basics.py
new file mode 100644
index 000000000..d8d0b901d
--- /dev/null
+++ b/src/mlpro/oa/streams/tasks/driftdetectors/drifts/instancebased/basics.py
@@ -0,0 +1,73 @@
+## -------------------------------------------------------------------------------------------------
+## -- Project : MLPro - The integrative middleware framework for standardized machine learning
+## -- Package : mlpro.oa.tasks.driftdetectors.drifts.instancebased
+## -- Module  : basics.py
+## -------------------------------------------------------------------------------------------------
+## -- History :
+## -- yyyy-mm-dd  Ver.      Auth.    Description
+## -- 2025-03-04  0.1.0     DA       Creation
+## -------------------------------------------------------------------------------------------------
+
+"""
+Ver. 0.1.0 (2025-03-04)
+
+This module provides a template class for instance-based drifts to be used in instance-based drift 
+detection algorithms.
+"""
+
+from datetime import datetime
+
+try:
+    from matplotlib.figure import Figure
+except:
+    class Figure : pass
+
+from mlpro.bf.mt import PlotSettings
+
+from mlpro.bf.streams import Instance
+from mlpro.oa.streams.tasks.driftdetectors.drifts.basics import Drift
+
+
+
+## -------------------------------------------------------------------------------------------------
+## -------------------------------------------------------------------------------------------------
+class DriftIB (Drift):
+    """
+    Sub-type for instance-based drift events.
+    
+    Parameters
+    ----------
+    p_id : int
+        Drift ID. Default value = 0.
+    p_tstamp : datetime
+        Time stamp of drift detection. Default = None.
+    p_visualize : bool
+        Boolean switch for visualisation. Default = False.
+    p_raising_object : object
+        Reference of the object raised. Default = None.
+    p_clusters : dict[Cluster]
+        Clusters associated with the anomaly. Default = None.
+    p_properties : dict
+        Poperties of clusters associated with the anomaly. Default = None.
+    **p_kwargs
+        Further optional keyword arguments.
+    """
+
+## -------------------------------------------------------------------------------------------------
+    def __init__(self,
+                 p_drift_status : bool,
+                 p_instances : list[Instance],
+                 p_id : int = 0,
+                 p_tstamp : datetime = None,
+                 p_visualize : bool = False,
+                 p_raising_object : object = None,
+                 **p_kwargs):
+        
+        super().__init__( p_drift_status = p_drift_status,
+                          p_id = p_id,
+                          p_tstamp = p_tstamp,
+                          p_visualize = p_visualize, 
+                          p_raising_object = p_raising_object,
+                          **p_kwargs )
+        
+        self.instances : list[Instance] = p_instances
\ No newline at end of file
diff --git a/src/mlpro/oa/streams/tasks/driftdetectors/drifts/instancebased/movement.py b/src/mlpro/oa/streams/tasks/driftdetectors/drifts/instancebased/movement.py
new file mode 100644
index 000000000..cf61fe111
--- /dev/null
+++ b/src/mlpro/oa/streams/tasks/driftdetectors/drifts/instancebased/movement.py
@@ -0,0 +1,29 @@
+## -------------------------------------------------------------------------------------------------
+## -- Project : MLPro - The integrative middleware framework for standardized machine learning
+## -- Package : mlpro.oa.tasks.driftdetectors.drifts.instancebased
+## -- Module  : movement.py
+## -------------------------------------------------------------------------------------------------
+## -- History :
+## -- yyyy-mm-dd  Ver.      Auth.    Description
+## -- 2025-03-04  1.0.0     DA/DS    Creation
+## -------------------------------------------------------------------------------------------------
+
+"""
+Ver. 1.0.0 (2025-03-04)
+
+This module provides a sub-typ of class DriftIB related to data drift of type movement.
+"""
+
+from mlpro.oa.streams.tasks.driftdetectors.drifts.instancebased.basics import DriftIB
+
+
+
+
+## -------------------------------------------------------------------------------------------------
+## -------------------------------------------------------------------------------------------------
+class DriftIBMovement (DriftIB):
+    """
+    Sub-type indicating the begin or end of a data drift of type movement.
+    """
+
+    pass
diff --git a/src/mlpro/oa/streams/tasks/driftdetectors/instancebased/__init__.py b/src/mlpro/oa/streams/tasks/driftdetectors/instancebased/__init__.py
index e69de29bb..8e650408e 100644
--- a/src/mlpro/oa/streams/tasks/driftdetectors/instancebased/__init__.py
+++ b/src/mlpro/oa/streams/tasks/driftdetectors/instancebased/__init__.py
@@ -0,0 +1 @@
+from mlpro.oa.streams.tasks.driftdetectors.instancebased.basics import DriftDetectorIB
\ No newline at end of file
diff --git a/src/mlpro/oa/streams/tasks/driftdetectors/instancebased/basics.py b/src/mlpro/oa/streams/tasks/driftdetectors/instancebased/basics.py
new file mode 100644
index 000000000..17d063751
--- /dev/null
+++ b/src/mlpro/oa/streams/tasks/driftdetectors/instancebased/basics.py
@@ -0,0 +1,32 @@
+## -- ----------------------------------------------------------------------------------------------
+## -- Project : MLPro - The integrative middleware framework for standardized machine learning
+## -- Package : mlpro.oa.streams.tasks.driftdetectors.instancebased
+## -- Module  : basics.py
+## -------------------------------------------------------------------------------------------------
+## -- History :
+## -- yyyy-mm-dd  Ver.      Auth.    Description
+## -- 2025-03-04  0.1.0     DA       Creation
+## -------------------------------------------------------------------------------------------------
+
+"""
+Ver. 0.1.0 (2025-03-04)
+
+This module provides a template for instance-based drift detection algorithms to be used in the context of online adaptivity.
+"""
+
+from mlpro.oa.streams.tasks.driftdetectors.basics import DriftDetector
+
+
+
+
+## -------------------------------------------------------------------------------------------------
+## -------------------------------------------------------------------------------------------------
+class DriftDetectorIB (DriftDetector):
+    """
+    This is the base class for online-adaptive instance-based drift detectors. It raises an event 
+    when a drift is detected.
+    """
+
+    C_TYPE = 'Instance-based Drift Detector'
+
+       
\ No newline at end of file