diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_bf/10_layer0_elementary.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_bf/10_layer0_elementary.rst
index 877dbe3a9..a025eb595 100644
--- a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_bf/10_layer0_elementary.rst
+++ b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_bf/10_layer0_elementary.rst
@@ -1,5 +1,5 @@
 .. _target_api_bf_l0:
-Layer 0 - Elementary Functions
+Layer 0 - Elementary functions
 ==============================
 
 .. toctree::
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_bf/40_layer3_application_support.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_bf/40_layer3_application_support.rst
index 32916999c..545c4eda3 100644
--- a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_bf/40_layer3_application_support.rst
+++ b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_bf/40_layer3_application_support.rst
@@ -1,5 +1,5 @@
 .. _target_api_bf_l3:
-Layer 3 - Application Support
+Layer 3 - Application support
 =============================
 
 .. toctree::
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_bf/50_layer4_machine_learning.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_bf/50_layer4_machine_learning.rst
index 4c3dc40a4..09ea17e5a 100644
--- a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_bf/50_layer4_machine_learning.rst
+++ b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_bf/50_layer4_machine_learning.rst
@@ -1,5 +1,5 @@
 .. _target_api_bf_l4:
-Layer 4 - Machine Learning
+Layer 4 - Machine learning
 ==========================
 
 .. toctree::
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_gt/10_dg.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_gt/10_dg.rst
index b5024e5db..bf99500ed 100644
--- a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_gt/10_dg.rst
+++ b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_gt/10_dg.rst
@@ -1,6 +1,6 @@
 .. _target_api_gt_dg:
-Dynamic Games
-=======================
+MLPro-GT-DynamicGames - Dynamic games
+=====================================
 
 .. image:: images/MLPro-GT_class_diagram.drawio.png
    :scale: 50%
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_gt/20_native.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_gt/20_native.rst
index d7baebf12..4fb7a8fa5 100644
--- a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_gt/20_native.rst
+++ b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_gt/20_native.rst
@@ -1,6 +1,6 @@
 .. _target_api_gt_native:
-Native GT
-=======================
+MLPro-GT-Native - Native game theory
+====================================
 
 .. image:: images/MLPro-GT-Native_class_diagram.drawio.png
    :scale: 50%
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_gt/images/MLPro-GT-Native_class_diagram.drawio b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_gt/images/MLPro-GT-Native_class_diagram.drawio
index e4b84128b..b3c465504 100644
--- a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_gt/images/MLPro-GT-Native_class_diagram.drawio
+++ b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_gt/images/MLPro-GT-Native_class_diagram.drawio
@@ -1,11 +1,11 @@
-<mxfile host="Electron" modified="2023-12-08T08:50:44.329Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/22.1.2 Chrome/114.0.5735.289 Electron/25.9.4 Safari/537.36" etag="LX9_9OR63qjYJOUSi71h" version="22.1.2" type="device">
+<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="3770" dy="2610" 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="5729" dy="3109" 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="YwcJyiYA8xpYUULvoIaP-0" value="" style="group" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1" connectable="0">
-          <mxGeometry x="-420" y="1770" width="490" height="220" as="geometry" />
+          <mxGeometry x="-1690" y="-540" width="490" height="220" as="geometry" />
         </mxCell>
         <mxCell id="YwcJyiYA8xpYUULvoIaP-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="YwcJyiYA8xpYUULvoIaP-0" vertex="1">
           <mxGeometry width="489.99999999999994" height="220" as="geometry" />
@@ -51,7 +51,7 @@
         <mxCell id="YwcJyiYA8xpYUULvoIaP-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="YwcJyiYA8xpYUULvoIaP-8" vertex="1">
           <mxGeometry y="26" width="40.83333333333333" height="8" as="geometry" />
         </mxCell>
-        <mxCell id="B3U6xe70-WNpAOuPaKyA-0" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;strokeColor=#000000;fontSize=12;fontColor=#FF0000;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="B3U6xe70-WNpAOuPaKyA-3" target="B3U6xe70-WNpAOuPaKyA-24" edge="1">
+        <mxCell id="B3U6xe70-WNpAOuPaKyA-0" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;strokeColor=#000000;fontSize=12;fontColor=#FF0000;entryX=0.5;entryY=0;entryDx=0;entryDy=0;endArrow=block;endFill=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="B3U6xe70-WNpAOuPaKyA-3" target="B3U6xe70-WNpAOuPaKyA-24" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
               <mxPoint x="-740" y="470" />
@@ -60,7 +60,7 @@
             <mxPoint x="-611.4399999999996" y="534.836" as="sourcePoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="B3U6xe70-WNpAOuPaKyA-1" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;strokeColor=#000000;fontSize=12;fontColor=#FF0000;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="B3U6xe70-WNpAOuPaKyA-3" target="B3U6xe70-WNpAOuPaKyA-44" edge="1">
+        <mxCell id="B3U6xe70-WNpAOuPaKyA-1" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;strokeColor=#000000;fontSize=12;fontColor=#FF0000;entryX=0.5;entryY=0;entryDx=0;entryDy=0;endArrow=block;endFill=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="B3U6xe70-WNpAOuPaKyA-3" target="B3U6xe70-WNpAOuPaKyA-44" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
               <mxPoint x="-740" y="470" />
@@ -69,7 +69,7 @@
             <mxPoint x="-611.4399999999996" y="532.47" as="sourcePoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="B3U6xe70-WNpAOuPaKyA-2" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.75;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="B3U6xe70-WNpAOuPaKyA-3" target="B3U6xe70-WNpAOuPaKyA-70" edge="1">
+        <mxCell id="B3U6xe70-WNpAOuPaKyA-2" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.75;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;endArrow=block;endFill=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="B3U6xe70-WNpAOuPaKyA-3" target="B3U6xe70-WNpAOuPaKyA-70" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="B3U6xe70-WNpAOuPaKyA-3" value="GTGame (bf.ml.Scenario)" 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;swimlaneFillColor=#ffffff;gradientColor=#FFFFFF;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
@@ -171,15 +171,6 @@
         <mxCell id="B3U6xe70-WNpAOuPaKyA-22" value="get_player_ids(): list" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontColor=#000000;strokeColor=none;dashed=1;" parent="B3U6xe70-WNpAOuPaKyA-18" vertex="1">
           <mxGeometry y="110" width="260" height="26" as="geometry" />
         </mxCell>
-        <mxCell id="B3U6xe70-WNpAOuPaKyA-23" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;strokeColor=#000000;fontSize=12;fontColor=#FF0000;endArrow=block;endFill=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" target="B3U6xe70-WNpAOuPaKyA-11" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <mxPoint x="-730" y="1200" as="sourcePoint" />
-            <Array as="points">
-              <mxPoint x="-730" y="1170" />
-              <mxPoint x="-730" y="1170" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
         <mxCell id="B3U6xe70-WNpAOuPaKyA-24" value="GTCoalition (GTPlayer)" 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;swimlaneFillColor=#ffffff;gradientColor=#FFFFFF;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
           <mxGeometry x="-900" y="500" width="380" height="664" as="geometry">
             <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
@@ -333,7 +324,7 @@
         <mxCell id="r4KT35VXYHTNUlkVge_L-17" value="_call_zero_sum(): bool" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontColor=#0000FF;strokeColor=none;dashed=1;" parent="B3U6xe70-WNpAOuPaKyA-44" vertex="1">
           <mxGeometry y="371" width="280" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="B3U6xe70-WNpAOuPaKyA-52" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;strokeColor=#000000;fontSize=12;fontColor=#FF0000;endArrow=classic;endFill=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="B3U6xe70-WNpAOuPaKyA-14" target="B3U6xe70-WNpAOuPaKyA-19" edge="1">
+        <mxCell id="B3U6xe70-WNpAOuPaKyA-52" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;strokeColor=#000000;fontSize=12;fontColor=#FF0000;endArrow=block;endFill=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="B3U6xe70-WNpAOuPaKyA-14" target="B3U6xe70-WNpAOuPaKyA-19" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="B3U6xe70-WNpAOuPaKyA-55" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="B3U6xe70-WNpAOuPaKyA-56" target="B3U6xe70-WNpAOuPaKyA-3" edge="1">
@@ -430,7 +421,7 @@
             <mxPoint x="-420" y="630" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="B3U6xe70-WNpAOuPaKyA-81" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="B3U6xe70-WNpAOuPaKyA-82" target="B3U6xe70-WNpAOuPaKyA-87" edge="1">
+        <mxCell id="B3U6xe70-WNpAOuPaKyA-81" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;endArrow=block;endFill=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="B3U6xe70-WNpAOuPaKyA-82" target="B3U6xe70-WNpAOuPaKyA-87" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="B3U6xe70-WNpAOuPaKyA-82" value="GTTrainingResults&#xa;(bf.ml.TrainingResults)" style="swimlane;fontStyle=3;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=46;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">
@@ -494,7 +485,7 @@
         <mxCell id="B3U6xe70-WNpAOuPaKyA-94" value="memorize( p_cycle_id,&#xa;                  p_tstamp:timedelta,&#xa;                  p_data )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontColor=#000000;strokeColor=none;dashed=1;" parent="B3U6xe70-WNpAOuPaKyA-87" vertex="1">
           <mxGeometry y="288" width="260" height="56" as="geometry" />
         </mxCell>
-        <mxCell id="B3U6xe70-WNpAOuPaKyA-95" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="B3U6xe70-WNpAOuPaKyA-57" target="B3U6xe70-WNpAOuPaKyA-82" edge="1">
+        <mxCell id="B3U6xe70-WNpAOuPaKyA-95" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;endArrow=block;endFill=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="B3U6xe70-WNpAOuPaKyA-57" target="B3U6xe70-WNpAOuPaKyA-82" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="r4KT35VXYHTNUlkVge_L-4" value="GTFunction (bf.various.Persistent)" 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;swimlaneFillColor=#ffffff;gradientColor=#FFFFFF;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
@@ -520,7 +511,7 @@
         <mxCell id="r4KT35VXYHTNUlkVge_L-7" value="__init__( p_func_type:int,&#xa;               p_dim_elems:list=None,&#xa;               p_num_coalisions:int=None,&#xa;               p_loggging=Log.C_LOG_ALL )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontColor=#000000;strokeColor=none;dashed=1;" parent="r4KT35VXYHTNUlkVge_L-4" vertex="1">
           <mxGeometry y="138" width="320" height="72" as="geometry" />
         </mxCell>
-        <mxCell id="HBjwMbkpvGOjvuiMcpyg-0" value="_setup_mapping_matrix()" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontColor=#0000FF;strokeColor=none;dashed=1;" vertex="1" parent="r4KT35VXYHTNUlkVge_L-4">
+        <mxCell id="HBjwMbkpvGOjvuiMcpyg-0" value="_setup_mapping_matrix()" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontColor=#0000FF;strokeColor=none;dashed=1;" parent="r4KT35VXYHTNUlkVge_L-4" vertex="1">
           <mxGeometry y="210" width="320" height="26" as="geometry" />
         </mxCell>
         <mxCell id="r4KT35VXYHTNUlkVge_L-8" value="_setup_payoff_matrix()" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontColor=#0000FF;strokeColor=none;dashed=1;" parent="r4KT35VXYHTNUlkVge_L-4" vertex="1">
@@ -544,9 +535,16 @@
         <mxCell id="r4KT35VXYHTNUlkVge_L-15" value="zero_sum(): bool" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontColor=#000000;strokeColor=none;dashed=1;" parent="r4KT35VXYHTNUlkVge_L-4" vertex="1">
           <mxGeometry y="436" width="320" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="r4KT35VXYHTNUlkVge_L-9" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="B3U6xe70-WNpAOuPaKyA-48" target="r4KT35VXYHTNUlkVge_L-4" edge="1">
+        <mxCell id="r4KT35VXYHTNUlkVge_L-9" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;endArrow=block;endFill=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="B3U6xe70-WNpAOuPaKyA-48" target="r4KT35VXYHTNUlkVge_L-4" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
+        <mxCell id="B3U6xe70-WNpAOuPaKyA-23" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;strokeColor=#000000;fontSize=12;fontColor=#FF0000;endArrow=block;endFill=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" target="B3U6xe70-WNpAOuPaKyA-11" edge="1" source="B3U6xe70-WNpAOuPaKyA-24">
+          <mxGeometry relative="1" as="geometry">
+            <mxPoint x="-730" y="1194" as="sourcePoint" />
+            <Array as="points" />
+            <mxPoint x="-730" y="1214" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
       </root>
     </mxGraphModel>
   </diagram>
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_gt/images/MLPro-GT-Native_class_diagram.drawio.png b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_gt/images/MLPro-GT-Native_class_diagram.drawio.png
index e668fd706..d45566b86 100644
Binary files a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_gt/images/MLPro-GT-Native_class_diagram.drawio.png and b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_gt/images/MLPro-GT-Native_class_diagram.drawio.png differ
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_gt/images/MLPro-GT_class_diagram.drawio b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_gt/images/MLPro-GT_class_diagram.drawio
index 1cb866be3..6a0bb31fe 100644
--- a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_gt/images/MLPro-GT_class_diagram.drawio
+++ b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_gt/images/MLPro-GT_class_diagram.drawio
@@ -1,6 +1,6 @@
-<mxfile host="Electron" modified="2023-09-25T09:09:57.393Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/21.7.5 Chrome/114.0.5735.289 Electron/25.8.1 Safari/537.36" etag="t94_so88YHJGF0YCU8_P" version="21.7.5" type="device">
+<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="1687" dy="1125" 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="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">
       <root>
         <mxCell id="WIyWlLk6GJQsqaUBKTNV-0" />
         <mxCell id="WIyWlLk6GJQsqaUBKTNV-1" parent="WIyWlLk6GJQsqaUBKTNV-0" />
@@ -161,7 +161,7 @@
         <mxCell id="txXCzBs2dMcAB43p3r7v-26" value="C_NAME = &#39;GT&#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="txXCzBs2dMcAB43p3r7v-25" vertex="1">
           <mxGeometry y="26" width="260" height="26" as="geometry" />
         </mxCell>
-        <mxCell id="GUk3ROs5eLHXGbxJfvZo-4" value="C_CLS_RESULTS = GTTrainingResults" 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="txXCzBs2dMcAB43p3r7v-25">
+        <mxCell id="GUk3ROs5eLHXGbxJfvZo-4" value="C_CLS_RESULTS = GTTrainingResults" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="txXCzBs2dMcAB43p3r7v-25" vertex="1">
           <mxGeometry y="52" width="260" height="26" as="geometry" />
         </mxCell>
         <mxCell id="txXCzBs2dMcAB43p3r7v-27" 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="txXCzBs2dMcAB43p3r7v-25" vertex="1">
@@ -199,7 +199,7 @@
         <mxCell id="txXCzBs2dMcAB43p3r7v-37" value="compute_action(p_state:State,&#xa;                           p_action_leaders=False): Action" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="txXCzBs2dMcAB43p3r7v-30" vertex="1">
           <mxGeometry y="346" width="280" height="44" as="geometry" />
         </mxCell>
-        <mxCell id="txXCzBs2dMcAB43p3r7v-38" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;endArrow=classic;endFill=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="txXCzBs2dMcAB43p3r7v-39" target="txXCzBs2dMcAB43p3r7v-30" edge="1">
+        <mxCell id="txXCzBs2dMcAB43p3r7v-38" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;endArrow=block;endFill=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="txXCzBs2dMcAB43p3r7v-39" target="txXCzBs2dMcAB43p3r7v-30" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="txXCzBs2dMcAB43p3r7v-39" value="GTMultiPlayer_SG&#xa;(MultiPlayer)" style="swimlane;fontStyle=3;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=38;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">
@@ -222,18 +222,18 @@
         <mxCell id="txXCzBs2dMcAB43p3r7v-44" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=0.482;entryY=1.007;entryDx=0;entryDy=0;entryPerimeter=0;endArrow=block;endFill=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="txXCzBs2dMcAB43p3r7v-40" target="txXCzBs2dMcAB43p3r7v-23" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="GUk3ROs5eLHXGbxJfvZo-0" value="GTTrainingResults (rl.RLTrainingResults)" 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;" vertex="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
+        <mxCell id="GUk3ROs5eLHXGbxJfvZo-0" value="GTTrainingResults (rl.RLTrainingResults)" 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="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
           <mxGeometry x="810" y="757" width="260" height="70" as="geometry">
             <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="GUk3ROs5eLHXGbxJfvZo-1" value="C_NAME = &#39;GT&#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="GUk3ROs5eLHXGbxJfvZo-0">
+        <mxCell id="GUk3ROs5eLHXGbxJfvZo-1" value="C_NAME = &#39;GT&#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="GUk3ROs5eLHXGbxJfvZo-0" vertex="1">
           <mxGeometry y="26" width="260" height="26" as="geometry" />
         </mxCell>
-        <mxCell id="GUk3ROs5eLHXGbxJfvZo-2" value="" style="line;html=1;strokeWidth=1;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;" vertex="1" parent="GUk3ROs5eLHXGbxJfvZo-0">
+        <mxCell id="GUk3ROs5eLHXGbxJfvZo-2" 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="GUk3ROs5eLHXGbxJfvZo-0" vertex="1">
           <mxGeometry y="52" width="260" height="8" as="geometry" />
         </mxCell>
-        <mxCell id="GUk3ROs5eLHXGbxJfvZo-3" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="txXCzBs2dMcAB43p3r7v-28" target="GUk3ROs5eLHXGbxJfvZo-1">
+        <mxCell id="GUk3ROs5eLHXGbxJfvZo-3" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;endArrow=block;endFill=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="txXCzBs2dMcAB43p3r7v-28" target="GUk3ROs5eLHXGbxJfvZo-1" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
       </root>
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_gt/images/MLPro-GT_class_diagram.drawio.png b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_gt/images/MLPro-GT_class_diagram.drawio.png
index e2762908b..b03577cbf 100644
Binary files a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_gt/images/MLPro-GT_class_diagram.drawio.png and b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_gt/images/MLPro-GT_class_diagram.drawio.png differ
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/01_streams.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/01_streams.rst
index 13b52ca41..1ec6b0996 100644
--- a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/01_streams.rst
+++ b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/01_streams.rst
@@ -1,6 +1,6 @@
 .. _target_api_oa_streams:
-Online-adaptive data stream processing
-======================================
+MLPro-OA-Streams - Online-adaptive data stream processing
+=========================================================
 
 .. toctree::
    :maxdepth: 2
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/02_systems.rst.off b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/02_systems.rst.off
index 53516997f..764d1b9d1 100644
--- a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/02_systems.rst.off
+++ b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/02_systems.rst.off
@@ -1,6 +1,6 @@
 .. _target_api_oa_systems:
-Online-adaptive state-based systems
-===================================
+MLPro-OA-Systems - Online-adaptive state-based systems
+======================================================
 
 .. toctree::
    :maxdepth: 2
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/30_anomaly_detectors.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection.rst
similarity index 61%
rename from doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/30_anomaly_detectors.rst
rename to doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection.rst
index 72e54e2ef..0c31af5a0 100644
--- a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/30_anomaly_detectors.rst
+++ b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection.rst
@@ -2,13 +2,10 @@
 Anomaly detection
 =================
 
-.. image:: images/MLPro-OA-Anomaly-Detectors_class_diagram.drawio.png
+.. image:: 30_anomaly_detection/images/MLPro-OA-Anomaly-Detectors_class_diagram.drawio.png
    :scale: 50%
    
    
-Template for anomaly detectors
-------------------------------
-
 .. automodule:: mlpro.oa.streams.tasks.anomalydetectors.basics
    :members:
    :undoc-members:
@@ -16,9 +13,6 @@ Template for anomaly detectors
    :show-inheritance:
 
 
-Template for anomalies
-----------------------
-
 .. automodule:: mlpro.oa.streams.tasks.anomalydetectors.anomalies.basics
    :members:
    :undoc-members:
@@ -26,11 +20,8 @@ Template for anomalies
    :show-inheritance:
 
 
-Concrete anomalies and algorithms
----------------------------------
-
 .. toctree::
    :maxdepth: 2
    :glob:
    
-   anomaly_detectors/*
+   30_anomaly_detection/*
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/10_common_anomalies.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/10_common_anomalies.rst
deleted file mode 100644
index f659bc92f..000000000
--- a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/10_common_anomalies.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-.. _target_api_oa_stream_tasks_ad_common_anomalies:
-Common anomalies
-================
-  
-
-.. toctree::
-   :maxdepth: 2
-   :glob:
-   
-   common_anomalies/*
\ No newline at end of file
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/10_instance_based.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/10_instance_based.rst
new file mode 100644
index 000000000..f70d19dda
--- /dev/null
+++ b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/10_instance_based.rst
@@ -0,0 +1,28 @@
+.. _target_api_oa_stream_tasks_ad_ib:
+Instance-based anomalies and detectors
+======================================
+
+
+.. image:: 10_instance_based/images/MLPro-OA-Anomaly-Detectors-IB_class_diagram.drawio.png
+   :scale: 50%
+
+
+.. automodule:: mlpro.oa.streams.tasks.anomalydetectors.instancebased.basics
+   :members:
+   :undoc-members:
+   :private-members:
+   :show-inheritance:
+
+
+.. automodule:: mlpro.oa.streams.tasks.anomalydetectors.anomalies.instancebased.basics
+   :members:
+   :undoc-members:
+   :private-members:
+   :show-inheritance:
+
+
+.. toctree::
+   :maxdepth: 2
+   :glob:
+   
+   10_instance_based/*
\ No newline at end of file
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/10_instance_based/10_common_anomalies.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/10_instance_based/10_common_anomalies.rst
new file mode 100644
index 000000000..7a431257b
--- /dev/null
+++ b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/10_instance_based/10_common_anomalies.rst
@@ -0,0 +1,23 @@
+.. _target_api_oa_stream_tasks_ad_common_anomalies:
+Common anomalies
+================
+
+.. automodule:: mlpro.oa.streams.tasks.anomalydetectors.anomalies.instancebased.point
+   :members:
+   :undoc-members:
+   :private-members:
+   :show-inheritance:
+
+
+.. automodule:: mlpro.oa.streams.tasks.anomalydetectors.anomalies.instancebased.group
+   :members:
+   :undoc-members:
+   :private-members:
+   :show-inheritance:
+
+
+.. automodule:: mlpro.oa.streams.tasks.anomalydetectors.anomalies.instancebased.contextual
+   :members:
+   :undoc-members:
+   :private-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/10_instance_based/20_common_algorithms.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/10_instance_based/20_common_algorithms.rst
new file mode 100644
index 000000000..760d60ab9
--- /dev/null
+++ b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/10_instance_based/20_common_algorithms.rst
@@ -0,0 +1,9 @@
+.. _target_api_oa_stream_tasks_ad_common_algorithms:
+Common algorithms
+================= 
+
+.. automodule:: mlpro.oa.streams.tasks.anomalydetectors.instancebased.detectors_point_group
+   :members:
+   :undoc-members:
+   :private-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/10_instance_based/images/MLPro-OA-Anomaly-Detectors-IB_class_diagram.drawio b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/10_instance_based/images/MLPro-OA-Anomaly-Detectors-IB_class_diagram.drawio
new file mode 100644
index 000000000..179bacfa6
--- /dev/null
+++ b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/10_instance_based/images/MLPro-OA-Anomaly-Detectors-IB_class_diagram.drawio
@@ -0,0 +1,217 @@
+<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">
+      <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="1090" 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="7JkVl93vQoOUYRVFK4Rs-23" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="p2okAq9_pR5mkignAm-u-1" target="7JkVl93vQoOUYRVFK4Rs-1" edge="1">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="p2okAq9_pR5mkignAm-u-1" value="PointAnomaly (AnomalyIB)" style="swimlane;fontStyle=1;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;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;gradientColor=#FFFFFF;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="620" y="442" width="290" height="310" as="geometry">
+            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="Gbw-wuow6PzR90Tq7J3Y-12" value="C_PLOT_CH_SIZE = 0.06" 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="p2okAq9_pR5mkignAm-u-1">
+          <mxGeometry y="26" width="290" height="28" as="geometry" />
+        </mxCell>
+        <mxCell id="Gbw-wuow6PzR90Tq7J3Y-13" value="C_PLOT_CH_OFFSET = 0.4" 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="p2okAq9_pR5mkignAm-u-1">
+          <mxGeometry y="54" width="290" height="28" as="geometry" />
+        </mxCell>
+        <mxCell id="p2okAq9_pR5mkignAm-u-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=1;fillColor=#dae8fc;gradientColor=#ffffff;" parent="p2okAq9_pR5mkignAm-u-1" vertex="1">
+          <mxGeometry y="82" width="290" height="8" as="geometry" />
+        </mxCell>
+        <mxCell id="oLJumqx1HHhM9YScGNT0-30" value="_init_plot_2d( p_figure: Figure,&#xa;                       p_settings: PlotSettings,&#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;" parent="p2okAq9_pR5mkignAm-u-1" vertex="1">
+          <mxGeometry y="90" width="290" height="50" as="geometry" />
+        </mxCell>
+        <mxCell id="N38WU9mJ-Era6qwWuLtT-4" value="_init_plot_3d( p_figure: Figure,&#xa;                       p_settings: PlotSettings,&#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;" parent="p2okAq9_pR5mkignAm-u-1" vertex="1">
+          <mxGeometry y="140" width="290" height="50" as="geometry" />
+        </mxCell>
+        <mxCell id="N38WU9mJ-Era6qwWuLtT-5" value="_init_plot_nd( p_figure: Figure,&#xa;                       p_settings: PlotSettings,&#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;" parent="p2okAq9_pR5mkignAm-u-1" vertex="1">
+          <mxGeometry y="190" width="290" height="50" as="geometry" />
+        </mxCell>
+        <mxCell id="oLJumqx1HHhM9YScGNT0-31" value="_remove_plot_2d()" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="p2okAq9_pR5mkignAm-u-1" vertex="1">
+          <mxGeometry y="240" width="290" height="20" as="geometry" />
+        </mxCell>
+        <mxCell id="N38WU9mJ-Era6qwWuLtT-6" value="_remove_plot_3d()" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="p2okAq9_pR5mkignAm-u-1" vertex="1">
+          <mxGeometry y="260" width="290" height="20" as="geometry" />
+        </mxCell>
+        <mxCell id="N38WU9mJ-Era6qwWuLtT-7" value="_remove_plot_nd()" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="p2okAq9_pR5mkignAm-u-1" vertex="1">
+          <mxGeometry y="280" width="290" height="20" as="geometry" />
+        </mxCell>
+        <mxCell id="7JkVl93vQoOUYRVFK4Rs-24" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="y2l99iwQbg-wAnSwsQFK-0" target="7JkVl93vQoOUYRVFK4Rs-1" edge="1">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="1135" y="382" />
+              <mxPoint x="765" y="382" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="y2l99iwQbg-wAnSwsQFK-0" value="GroupAnomaly (AnomalyIB)" style="swimlane;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;swimlaneFillColor=#ffffff;gradientColor=#FFFFFF;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="990" y="442" width="290" height="420" as="geometry">
+            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="Gbw-wuow6PzR90Tq7J3Y-14" value="mean : float" 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="y2l99iwQbg-wAnSwsQFK-0">
+          <mxGeometry y="26" width="290" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="Gbw-wuow6PzR90Tq7J3Y-15" value="mean_deviation : float" 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="y2l99iwQbg-wAnSwsQFK-0">
+          <mxGeometry y="56" width="290" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="Gbw-wuow6PzR90Tq7J3Y-16" value="plot_update : 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="y2l99iwQbg-wAnSwsQFK-0">
+          <mxGeometry y="86" width="290" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="y2l99iwQbg-wAnSwsQFK-2" 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="y2l99iwQbg-wAnSwsQFK-0" vertex="1">
+          <mxGeometry y="116" width="290" height="8" as="geometry" />
+        </mxCell>
+        <mxCell id="y2l99iwQbg-wAnSwsQFK-3" value="__init__( p_instances : Instance = None,&#xa;               p_id = 0,&#xa;               p_tstamp : datetime = None,&#xa;               p_visualize : bool = False,&#xa;               p_raising_object : object = None,&#xa;               p_mean : float = None,&#xa;               p_deviation : float=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="y2l99iwQbg-wAnSwsQFK-0" vertex="1">
+          <mxGeometry y="124" width="290" height="126" as="geometry" />
+        </mxCell>
+        <mxCell id="iRqbgX-deYLXcJWkZiLP-6" value="_get_mean( ) -&gt; float" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="y2l99iwQbg-wAnSwsQFK-0" vertex="1">
+          <mxGeometry y="250" width="290" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="0cJ1NAXk0Xtcf3CmwPfC-10" value="_get_mean_deviation( ) -&gt; float" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="y2l99iwQbg-wAnSwsQFK-0" vertex="1">
+          <mxGeometry y="280" width="290" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="oLJumqx1HHhM9YScGNT0-34" value="_init_plot_nd( 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;" parent="y2l99iwQbg-wAnSwsQFK-0" vertex="1">
+          <mxGeometry y="310" width="290" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="N38WU9mJ-Era6qwWuLtT-8" value="_update_plot_nd( p_settings: PlotSettings,&#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;" parent="y2l99iwQbg-wAnSwsQFK-0" vertex="1">
+          <mxGeometry y="350" width="290" height="40" as="geometry" />
+        </mxCell>
+        <mxCell id="N38WU9mJ-Era6qwWuLtT-14" value="_remove_plot_nd()" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="y2l99iwQbg-wAnSwsQFK-0" vertex="1">
+          <mxGeometry y="390" width="290" height="20" as="geometry" />
+        </mxCell>
+        <mxCell id="7JkVl93vQoOUYRVFK4Rs-25" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="y2l99iwQbg-wAnSwsQFK-5" target="7JkVl93vQoOUYRVFK4Rs-1" edge="1">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="1505" y="382" />
+              <mxPoint x="765" y="382" />
+            </Array>
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="y2l99iwQbg-wAnSwsQFK-5" value="ContextualAnomaly (AnomalyIB)" style="swimlane;fontStyle=1;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;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;gradientColor=#FFFFFF;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="1360" y="442" width="290" height="39" as="geometry">
+            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="y2l99iwQbg-wAnSwsQFK-7" 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="y2l99iwQbg-wAnSwsQFK-5" vertex="1">
+          <mxGeometry y="26" width="290" height="8" as="geometry" />
+        </mxCell>
+        <mxCell id="Gbw-wuow6PzR90Tq7J3Y-11" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="hOcUKRqpv3udX4BvXm5B-1" target="Gbw-wuow6PzR90Tq7J3Y-0">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="hOcUKRqpv3udX4BvXm5B-1" value="AnomalyDetectorIBPG&#xa;(AnomalyDetectorIB)" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=42;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=#FFFFFF;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="150" y="442" width="350" height="320" as="geometry">
+            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="hOcUKRqpv3udX4BvXm5B-2" value="C_TYPE = &#39;Anomaly Detector (IBPG)&#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="hOcUKRqpv3udX4BvXm5B-1" vertex="1">
+          <mxGeometry y="42" width="350" height="28" as="geometry" />
+        </mxCell>
+        <mxCell id="K-uiR6WVb6SvZu_kqw6H-8" value="_group_anomalies : list[Anomaly]" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="hOcUKRqpv3udX4BvXm5B-1" vertex="1">
+          <mxGeometry y="70" width="350" height="28" as="geometry" />
+        </mxCell>
+        <mxCell id="K-uiR6WVb6SvZu_kqw6H-9" value="_group_anomalies_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;" parent="hOcUKRqpv3udX4BvXm5B-1" vertex="1">
+          <mxGeometry y="98" width="350" height="28" as="geometry" />
+        </mxCell>
+        <mxCell id="K-uiR6WVb6SvZu_kqw6H-11" value="_group_anomaly_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;" parent="hOcUKRqpv3udX4BvXm5B-1" vertex="1">
+          <mxGeometry y="126" width="350" height="28" as="geometry" />
+        </mxCell>
+        <mxCell id="hOcUKRqpv3udX4BvXm5B-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="hOcUKRqpv3udX4BvXm5B-1" vertex="1">
+          <mxGeometry y="154" width="350" height="8" as="geometry" />
+        </mxCell>
+        <mxCell id="hOcUKRqpv3udX4BvXm5B-4" value="__init__( p_group_anomaly_det : bool = True,&#xa;               p_name : str = None,&#xa;               p_range_max = StreamTask.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="hOcUKRqpv3udX4BvXm5B-1" vertex="1">
+          <mxGeometry y="162" width="350" height="124" as="geometry" />
+        </mxCell>
+        <mxCell id="hOcUKRqpv3udX4BvXm5B-5" value="_buffer_anomaly( p_anomaly : Anomaly)" 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="hOcUKRqpv3udX4BvXm5B-1" vertex="1">
+          <mxGeometry y="286" width="350" height="30" as="geometry" />
+        </mxCell>
+        <mxCell id="0cJ1NAXk0Xtcf3CmwPfC-8" value="Extended template&amp;nbsp;&lt;div&gt;for anomaly detectors. Auto-detects and raises groups of point anomalies as group anomalies&lt;/div&gt;" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;shadow=1;align=left;fontStyle=1" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="40" y="352" width="130" height="101" as="geometry" />
+        </mxCell>
+        <mxCell id="7JkVl93vQoOUYRVFK4Rs-1" value="AnomalyIB (Anomaly)" style="swimlane;fontStyle=1;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;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;gradientColor=#FFFFFF;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="620" y="162" width="290" height="160" as="geometry">
+            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="K-uiR6WVb6SvZu_kqw6H-3" 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="7JkVl93vQoOUYRVFK4Rs-1" vertex="1">
+          <mxGeometry y="26" width="290" height="26" as="geometry" />
+        </mxCell>
+        <mxCell id="7JkVl93vQoOUYRVFK4Rs-2" 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="7JkVl93vQoOUYRVFK4Rs-1" vertex="1">
+          <mxGeometry y="52" width="290" height="8" as="geometry" />
+        </mxCell>
+        <mxCell id="7JkVl93vQoOUYRVFK4Rs-3" value="__init__( p_instances : list[Instance],&#xa;               p_id = 0,&#xa;               p_tstamp : datetime = None,&#xa;               p_visualize : 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="7JkVl93vQoOUYRVFK4Rs-1" vertex="1">
+          <mxGeometry y="60" width="290" height="100" as="geometry" />
+        </mxCell>
+        <mxCell id="7JkVl93vQoOUYRVFK4Rs-11" value="Sub-type for instance-based anomalies" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;shadow=1;align=left;fontStyle=1;verticalAlign=top;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
+          <mxGeometry x="890" y="124.5" width="100" height="51" as="geometry" />
+        </mxCell>
+        <mxCell id="Gbw-wuow6PzR90Tq7J3Y-9" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=1;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="Gbw-wuow6PzR90Tq7J3Y-0" target="7JkVl93vQoOUYRVFK4Rs-1">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="Gbw-wuow6PzR90Tq7J3Y-0" value="AnomalyDetectorIB&#xa;(AnomalyDetector)" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=42;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;" vertex="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
+          <mxGeometry x="150" y="162" width="350" height="94" as="geometry">
+            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="Gbw-wuow6PzR90Tq7J3Y-1" value="C_TYPE = &#39;Anomaly Detector (IB)&#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="Gbw-wuow6PzR90Tq7J3Y-0">
+          <mxGeometry y="42" width="350" height="28" as="geometry" />
+        </mxCell>
+        <mxCell id="Gbw-wuow6PzR90Tq7J3Y-6" 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="Gbw-wuow6PzR90Tq7J3Y-0">
+          <mxGeometry y="70" width="350" height="8" as="geometry" />
+        </mxCell>
+        <mxCell id="Gbw-wuow6PzR90Tq7J3Y-10" value="Sub-type for instance-based anomaly detectors" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;shadow=1;align=left;fontStyle=1;verticalAlign=top;" vertex="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
+          <mxGeometry x="70" y="102" width="100" height="73.5" as="geometry" />
+        </mxCell>
+      </root>
+    </mxGraphModel>
+  </diagram>
+</mxfile>
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/10_instance_based/images/MLPro-OA-Anomaly-Detectors-IB_class_diagram.drawio.png b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/10_instance_based/images/MLPro-OA-Anomaly-Detectors-IB_class_diagram.drawio.png
new file mode 100644
index 000000000..8871180eb
Binary files /dev/null and b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/10_instance_based/images/MLPro-OA-Anomaly-Detectors-IB_class_diagram.drawio.png differ
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/30_cluster_based.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/20_cluster_based.rst
similarity index 61%
rename from doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/30_cluster_based.rst
rename to doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/20_cluster_based.rst
index ce6bc6716..a7fbfb6a3 100644
--- a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/30_cluster_based.rst
+++ b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/20_cluster_based.rst
@@ -3,7 +3,7 @@ Cluster-based anomalies and detectors
 =====================================
 
 
-.. image:: cluster_based/images/MLPro-OA-CB-Anomaly-Detectors_class_diagram.drawio.png
+.. image:: 20_cluster_based/images/MLPro-OA-CB-Anomaly-Detectors_class_diagram.drawio.png
    :scale: 50%
 
 
@@ -11,4 +11,4 @@ Cluster-based anomalies and detectors
    :maxdepth: 2
    :glob:
    
-   cluster_based/*
\ No newline at end of file
+   20_cluster_based/*
\ No newline at end of file
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/cluster_based/10_cb_anomalies.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/20_cluster_based/10_cb_anomalies.rst
similarity index 100%
rename from doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/cluster_based/10_cb_anomalies.rst
rename to doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/20_cluster_based/10_cb_anomalies.rst
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/cluster_based/20_cb_algorithms.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/20_cluster_based/20_cb_algorithms.rst
similarity index 100%
rename from doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/cluster_based/20_cb_algorithms.rst
rename to doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/20_cluster_based/20_cb_algorithms.rst
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/cluster_based/algorithms/01_basics.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/20_cluster_based/algorithms/01_basics.rst
similarity index 100%
rename from doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/cluster_based/algorithms/01_basics.rst
rename to doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/20_cluster_based/algorithms/01_basics.rst
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/cluster_based/algorithms/02_new.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/20_cluster_based/algorithms/02_new.rst
similarity index 100%
rename from doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/cluster_based/algorithms/02_new.rst
rename to doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/20_cluster_based/algorithms/02_new.rst
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/cluster_based/algorithms/03_disapperance.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/20_cluster_based/algorithms/03_disapperance.rst
similarity index 100%
rename from doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/cluster_based/algorithms/03_disapperance.rst
rename to doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/20_cluster_based/algorithms/03_disapperance.rst
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/cluster_based/algorithms/04_drift.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/20_cluster_based/algorithms/04_drift.rst
similarity index 100%
rename from doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/cluster_based/algorithms/04_drift.rst
rename to doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/20_cluster_based/algorithms/04_drift.rst
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/cluster_based/algorithms/05_size.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/20_cluster_based/algorithms/05_size.rst
similarity index 100%
rename from doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/cluster_based/algorithms/05_size.rst
rename to doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/20_cluster_based/algorithms/05_size.rst
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/cluster_based/algorithms/06_size geo.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/20_cluster_based/algorithms/06_size geo.rst
similarity index 100%
rename from doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/cluster_based/algorithms/06_size geo.rst
rename to doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/20_cluster_based/algorithms/06_size geo.rst
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/cluster_based/algorithms/07_density.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/20_cluster_based/algorithms/07_density.rst
similarity index 100%
rename from doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/cluster_based/algorithms/07_density.rst
rename to doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/20_cluster_based/algorithms/07_density.rst
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/cluster_based/anomalies/01_basics.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/20_cluster_based/anomalies/01_basics.rst
similarity index 100%
rename from doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/cluster_based/anomalies/01_basics.rst
rename to doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/20_cluster_based/anomalies/01_basics.rst
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/cluster_based/anomalies/02_new.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/20_cluster_based/anomalies/02_new.rst
similarity index 100%
rename from doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/cluster_based/anomalies/02_new.rst
rename to doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/20_cluster_based/anomalies/02_new.rst
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/cluster_based/anomalies/03_disapperance.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/20_cluster_based/anomalies/03_disapperance.rst
similarity index 100%
rename from doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/cluster_based/anomalies/03_disapperance.rst
rename to doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/20_cluster_based/anomalies/03_disapperance.rst
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/cluster_based/anomalies/04_drift.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/20_cluster_based/anomalies/04_drift.rst
similarity index 100%
rename from doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/cluster_based/anomalies/04_drift.rst
rename to doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/20_cluster_based/anomalies/04_drift.rst
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/cluster_based/anomalies/05_enlargement.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/20_cluster_based/anomalies/05_enlargement.rst
similarity index 100%
rename from doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/cluster_based/anomalies/05_enlargement.rst
rename to doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/20_cluster_based/anomalies/05_enlargement.rst
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/cluster_based/anomalies/06_shrinkage.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/20_cluster_based/anomalies/06_shrinkage.rst
similarity index 100%
rename from doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/cluster_based/anomalies/06_shrinkage.rst
rename to doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/20_cluster_based/anomalies/06_shrinkage.rst
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/cluster_based/anomalies/07_size_variation.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/20_cluster_based/anomalies/07_size_variation.rst
similarity index 100%
rename from doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/cluster_based/anomalies/07_size_variation.rst
rename to doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/20_cluster_based/anomalies/07_size_variation.rst
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/cluster_based/images/MLPro-OA-CB-Anomaly-Detectors_class_diagram.drawio b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/20_cluster_based/images/MLPro-OA-CB-Anomaly-Detectors_class_diagram.drawio
similarity index 100%
rename from doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/cluster_based/images/MLPro-OA-CB-Anomaly-Detectors_class_diagram.drawio
rename to doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/20_cluster_based/images/MLPro-OA-CB-Anomaly-Detectors_class_diagram.drawio
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/cluster_based/images/MLPro-OA-CB-Anomaly-Detectors_class_diagram.drawio.png b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/20_cluster_based/images/MLPro-OA-CB-Anomaly-Detectors_class_diagram.drawio.png
similarity index 100%
rename from doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/cluster_based/images/MLPro-OA-CB-Anomaly-Detectors_class_diagram.drawio.png
rename to doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/20_cluster_based/images/MLPro-OA-CB-Anomaly-Detectors_class_diagram.drawio.png
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/20_common_algorithms.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/20_common_algorithms.rst
deleted file mode 100644
index ae5e1efb6..000000000
--- a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/20_common_algorithms.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-.. _target_api_oa_stream_tasks_ad_common_algorithms:
-Common algorithms
-=================
-  
-
-.. toctree::
-   :maxdepth: 2
-   :glob:
-   
-   common_algorithms/*
\ No newline at end of file
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/common_algorithms/01_paga_algorithm.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/common_algorithms/01_paga_algorithm.rst
deleted file mode 100644
index c4ddc2a5b..000000000
--- a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/common_algorithms/01_paga_algorithm.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-.. _target_api_oa_stream_tasks_ad_paga:
-Point and group anomaly detector
-================================
-  
-.. automodule:: mlpro.oa.streams.tasks.anomalydetectors.paga_detectors
-   :members:
-   :undoc-members:
-   :private-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/common_anomalies/01_point.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/common_anomalies/01_point.rst
deleted file mode 100644
index 9b442c923..000000000
--- a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/common_anomalies/01_point.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-.. _target_api_oa_stream_tasks_ad_common_anomalies_point:
-Point outlier
-=============
-  
-.. automodule:: mlpro.oa.streams.tasks.anomalydetectors.anomalies.point
-   :members:
-   :undoc-members:
-   :private-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/common_anomalies/02_group.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/common_anomalies/02_group.rst
deleted file mode 100644
index 276239db6..000000000
--- a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/common_anomalies/02_group.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-.. _target_api_oa_stream_tasks_ad_common_anomalies_group:
-Group outlier
-=============
-  
-.. automodule:: mlpro.oa.streams.tasks.anomalydetectors.anomalies.group
-   :members:
-   :undoc-members:
-   :private-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/common_anomalies/03_drift.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/common_anomalies/03_drift.rst
deleted file mode 100644
index 4e08e3448..000000000
--- a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/common_anomalies/03_drift.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-.. _target_api_oa_stream_tasks_ad_common_anomalies_drift:
-Drift
-=====
-  
-.. automodule:: mlpro.oa.streams.tasks.anomalydetectors.anomalies.drift
-   :members:
-   :undoc-members:
-   :private-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/common_anomalies/04_contextual.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/common_anomalies/04_contextual.rst
deleted file mode 100644
index fcb428ec5..000000000
--- a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/common_anomalies/04_contextual.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-.. _target_api_oa_stream_tasks_ad_common_anomalies_contextual:
-Contextual
-==========
-  
-.. automodule:: mlpro.oa.streams.tasks.anomalydetectors.anomalies.contextual
-   :members:
-   :undoc-members:
-   :private-members:
-   :show-inheritance:
\ No newline at end of file
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/images/.$MLPro-OA-Anomaly-Detectors_class_diagram.drawio.bkp b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/images/.$MLPro-OA-Anomaly-Detectors_class_diagram.drawio.bkp
deleted file mode 100644
index b89e82e3d..000000000
--- a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/images/.$MLPro-OA-Anomaly-Detectors_class_diagram.drawio.bkp
+++ /dev/null
@@ -1,349 +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="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">
-      <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="1180" 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="AnomalyDetector&#xa;(OAStreamTask)" 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="150" y="60" width="350" height="563" as="geometry">
-            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="4use4ZCXdNiZSNTW99xv-2" value="C_TYPE                           = &#39;Anomaly 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;fontStyle=0;fontColor=default;" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
-          <mxGeometry y="41" width="350" height="26" 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;&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="67" width="350" height="24" 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="26" as="geometry" />
-        </mxCell>
-        <mxCell id="K-uiR6WVb6SvZu_kqw6H-5" value="_ano_id : int = 0" 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="117" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-0" value="anomalies : dict[Anomaly]" 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-1">
-          <mxGeometry y="141" 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="167" width="350" height="8" as="geometry" />
-        </mxCell>
-        <mxCell id="4use4ZCXdNiZSNTW99xv-6" value="__init__( p_name : str = None,&#xa;               p_range_max=MLTask.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="175" width="350" height="109" as="geometry" />
-        </mxCell>
-        <mxCell id="N38WU9mJ-Era6qwWuLtT-0" value="_get_next_anomaly_id()" 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="284" width="350" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="4use4ZCXdNiZSNTW99xv-8" value="_get_anomalies() -&gt; dict[Anomaly]" 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;fontColor=default;" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
-          <mxGeometry y="314" width="350" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="oLJumqx1HHhM9YScGNT0-2" value="_buffer_anomaly(p_anomaly : Anomaly)" 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="344" width="350" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="oLJumqx1HHhM9YScGNT0-3" value="_remove_anomaly(p_anomaly : Anomaly)" 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="374" width="350" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="oLJumqx1HHhM9YScGNT0-4" value="_raise_anomaly_event(p_anomaly : Anomaly)" 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="404" 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;fontStyle=1" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
-          <mxGeometry y="434" width="350" height="40" as="geometry" />
-        </mxCell>
-        <mxCell id="oLJumqx1HHhM9YScGNT0-6" value="update_plot( p_inst : InstDict = None, **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;fontStyle=1" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
-          <mxGeometry y="474" width="350" height="29" 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;fontStyle=1" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
-          <mxGeometry y="503" width="350" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="hOcUKRqpv3udX4BvXm5B-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=1" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
-          <mxGeometry y="533" width="350" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="4use4ZCXdNiZSNTW99xv-16" value="Anomaly &#xa;(bf.various.Id, bf.events.Event, bf.plot.Plottable,&#xa;bf.math.normalizers.Renomalizable)" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=52;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=#FFFFFF;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="620" y="289" width="290" height="334" as="geometry">
-            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="oLJumqx1HHhM9YScGNT0-23" 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="52" 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="78" width="290" height="26" as="geometry" />
-        </mxCell>
-        <mxCell id="oLJumqx1HHhM9YScGNT0-25" value="C_PLOT_VALID_VIEWS = &#xa;          [ PlotSettings.C_VIEW_2D, &#xa;            PlotSettings.C_VIEW_3D, &#xa;            PlotSettings.C_VIEW_ND ]" 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="104" width="290" height="67" as="geometry" />
-        </mxCell>
-        <mxCell id="oLJumqx1HHhM9YScGNT0-26" value="C_PLOT_DEFAULT_VIEW = &#xa;            PlotSettings.C_VIEW_ND" 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="171" width="290" height="37" as="geometry" />
-        </mxCell>
-        <mxCell id="K-uiR6WVb6SvZu_kqw6H-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="208" 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="234" width="290" height="8" as="geometry" />
-        </mxCell>
-        <mxCell id="4use4ZCXdNiZSNTW99xv-21" value="__init__( p_id : int = 0,&#xa;               p_tstamp : datetime = None,&#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="242" width="290" height="82" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-23" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="p2okAq9_pR5mkignAm-u-1" target="7JkVl93vQoOUYRVFK4Rs-1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="p2okAq9_pR5mkignAm-u-1" value="PointAnomaly (IBAnomaly)" style="swimlane;fontStyle=1;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=3;fillColor=#f8cecc;strokeColor=#b85450;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;gradientColor=#F5F5F5;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="620" y="1240" width="290" height="369" as="geometry">
-            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="p2okAq9_pR5mkignAm-u-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=1;fillColor=#dae8fc;gradientColor=#ffffff;" parent="p2okAq9_pR5mkignAm-u-1" vertex="1">
-          <mxGeometry y="26" width="290" height="8" as="geometry" />
-        </mxCell>
-        <mxCell id="p2okAq9_pR5mkignAm-u-6" value="__init__( p_instance : Instance = None,&#xa;               p_ano_scores : list = None,&#xa;               p_visualize : bool = False,&#xa;               p_raising_object : object = None,&#xa;               p_det_time : str = None,&#xa;               p_deviation : float=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;" parent="p2okAq9_pR5mkignAm-u-1" vertex="1">
-          <mxGeometry y="34" width="290" height="110" as="geometry" />
-        </mxCell>
-        <mxCell id="oLJumqx1HHhM9YScGNT0-30" value="_init_plot_2d( p_figure: Figure,&#xa;                       p_settings: PlotSettings,&#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;" parent="p2okAq9_pR5mkignAm-u-1" vertex="1">
-          <mxGeometry y="144" width="290" height="50" as="geometry" />
-        </mxCell>
-        <mxCell id="N38WU9mJ-Era6qwWuLtT-4" value="_init_plot_3d( p_figure: Figure,&#xa;                       p_settings: PlotSettings,&#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;" parent="p2okAq9_pR5mkignAm-u-1" vertex="1">
-          <mxGeometry y="194" width="290" height="50" as="geometry" />
-        </mxCell>
-        <mxCell id="N38WU9mJ-Era6qwWuLtT-5" value="_init_plot_nd( p_figure: Figure,&#xa;                       p_settings: PlotSettings,&#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;" parent="p2okAq9_pR5mkignAm-u-1" vertex="1">
-          <mxGeometry y="244" width="290" height="50" as="geometry" />
-        </mxCell>
-        <mxCell id="oLJumqx1HHhM9YScGNT0-31" value="_remove_plot_2d()" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="p2okAq9_pR5mkignAm-u-1" vertex="1">
-          <mxGeometry y="294" width="290" height="20" as="geometry" />
-        </mxCell>
-        <mxCell id="N38WU9mJ-Era6qwWuLtT-6" value="_remove_plot_3d()" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="p2okAq9_pR5mkignAm-u-1" vertex="1">
-          <mxGeometry y="314" width="290" height="20" as="geometry" />
-        </mxCell>
-        <mxCell id="N38WU9mJ-Era6qwWuLtT-7" value="_remove_plot_nd()" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="p2okAq9_pR5mkignAm-u-1" vertex="1">
-          <mxGeometry y="334" width="290" height="20" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-24" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="y2l99iwQbg-wAnSwsQFK-0" target="7JkVl93vQoOUYRVFK4Rs-1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="1135" y="1180" />
-              <mxPoint x="765" y="1180" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="y2l99iwQbg-wAnSwsQFK-0" value="GroupAnomaly (IBAnomaly)" style="swimlane;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=3;fillColor=#f8cecc;strokeColor=#b85450;swimlaneFillColor=#ffffff;gradientColor=#F5F5F5;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="990" y="1240" width="290" height="369" as="geometry">
-            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="y2l99iwQbg-wAnSwsQFK-2" 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="y2l99iwQbg-wAnSwsQFK-0" vertex="1">
-          <mxGeometry y="26" width="290" height="8" as="geometry" />
-        </mxCell>
-        <mxCell id="y2l99iwQbg-wAnSwsQFK-3" value="__init__( p_instances : Instance = None,&#xa;               p_ano_scores : list = None,&#xa;               p_visualize : bool = False,&#xa;               p_raising_object : object = None,&#xa;               p_det_time : str = None,&#xa;               p_mean : float = None,&#xa;               p_deviation : float=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;" parent="y2l99iwQbg-wAnSwsQFK-0" vertex="1">
-          <mxGeometry y="34" width="290" height="120" as="geometry" />
-        </mxCell>
-        <mxCell id="hOcUKRqpv3udX4BvXm5B-10" value="set_instances( p_instances : Instance,&#xa;                        p_ano_scores : list)" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="y2l99iwQbg-wAnSwsQFK-0" vertex="1">
-          <mxGeometry y="154" width="290" height="40" as="geometry" />
-        </mxCell>
-        <mxCell id="iRqbgX-deYLXcJWkZiLP-6" value="get_mean( ) -&gt; float" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="y2l99iwQbg-wAnSwsQFK-0" vertex="1">
-          <mxGeometry y="194" width="290" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="0cJ1NAXk0Xtcf3CmwPfC-10" value="get_mean_deviation( ) -&gt; float" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="y2l99iwQbg-wAnSwsQFK-0" vertex="1">
-          <mxGeometry y="224" width="290" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="oLJumqx1HHhM9YScGNT0-34" value="_init_plot_nd( 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;" parent="y2l99iwQbg-wAnSwsQFK-0" vertex="1">
-          <mxGeometry y="254" width="290" height="40" as="geometry" />
-        </mxCell>
-        <mxCell id="N38WU9mJ-Era6qwWuLtT-8" value="_update_plot_nd( p_settings: PlotSettings,&#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;" parent="y2l99iwQbg-wAnSwsQFK-0" vertex="1">
-          <mxGeometry y="294" width="290" height="40" as="geometry" />
-        </mxCell>
-        <mxCell id="N38WU9mJ-Era6qwWuLtT-14" value="_remove_plot_nd()" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="y2l99iwQbg-wAnSwsQFK-0" vertex="1">
-          <mxGeometry y="334" width="290" height="20" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-25" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="y2l99iwQbg-wAnSwsQFK-5" target="7JkVl93vQoOUYRVFK4Rs-1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="1505" y="1180" />
-              <mxPoint x="765" y="1180" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="y2l99iwQbg-wAnSwsQFK-5" value="ContextualAnomaly (Anomaly)" style="swimlane;fontStyle=1;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;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;gradientColor=#F5F5F5;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="1360" y="1240" width="290" height="39" as="geometry">
-            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="y2l99iwQbg-wAnSwsQFK-7" 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="y2l99iwQbg-wAnSwsQFK-5" vertex="1">
-          <mxGeometry y="26" width="290" height="8" as="geometry" />
-        </mxCell>
-        <mxCell id="hOcUKRqpv3udX4BvXm5B-1" value="AnomalyDetectorPAGA&#xa;(AnomalyDetector)" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=42;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=1;strokeWidth=3;fillColor=#f8cecc;strokeColor=#b85450;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;gradientColor=#F5F5F5;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="150" y="1240" width="350" height="344" as="geometry">
-            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="hOcUKRqpv3udX4BvXm5B-2" value="C_TYPE = &#39;Anomaly Detector PAGA&#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="hOcUKRqpv3udX4BvXm5B-1" vertex="1">
-          <mxGeometry y="42" width="350" height="28" as="geometry" />
-        </mxCell>
-        <mxCell id="K-uiR6WVb6SvZu_kqw6H-8" value="_group_anomalies : list[Anomaly]" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="hOcUKRqpv3udX4BvXm5B-1" vertex="1">
-          <mxGeometry y="70" width="350" height="28" as="geometry" />
-        </mxCell>
-        <mxCell id="K-uiR6WVb6SvZu_kqw6H-9" value="_group_anomalies_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;" parent="hOcUKRqpv3udX4BvXm5B-1" vertex="1">
-          <mxGeometry y="98" width="350" height="28" as="geometry" />
-        </mxCell>
-        <mxCell id="K-uiR6WVb6SvZu_kqw6H-10" value="_group_ano_scores : list" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="hOcUKRqpv3udX4BvXm5B-1" vertex="1">
-          <mxGeometry y="126" width="350" height="28" as="geometry" />
-        </mxCell>
-        <mxCell id="K-uiR6WVb6SvZu_kqw6H-11" value="_group_anomaly_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;" parent="hOcUKRqpv3udX4BvXm5B-1" vertex="1">
-          <mxGeometry y="154" width="350" height="28" as="geometry" />
-        </mxCell>
-        <mxCell id="hOcUKRqpv3udX4BvXm5B-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="hOcUKRqpv3udX4BvXm5B-1" vertex="1">
-          <mxGeometry y="182" width="350" height="8" as="geometry" />
-        </mxCell>
-        <mxCell id="hOcUKRqpv3udX4BvXm5B-4" value="__init__( p_group_anomaly_det : bool = True,&#xa;               p_name : str = None,&#xa;               p_range_max=MLTask.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="hOcUKRqpv3udX4BvXm5B-1" vertex="1">
-          <mxGeometry y="190" width="350" height="124" as="geometry" />
-        </mxCell>
-        <mxCell id="hOcUKRqpv3udX4BvXm5B-5" value="_buffer_anomaly( p_anomaly : Anomaly)" 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="hOcUKRqpv3udX4BvXm5B-1" vertex="1">
-          <mxGeometry y="314" width="350" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="hOcUKRqpv3udX4BvXm5B-7" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fontColor=#0000FF;endArrow=block;endFill=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="hOcUKRqpv3udX4BvXm5B-1" target="4use4ZCXdNiZSNTW99xv-1" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <mxPoint x="410" y="661" as="targetPoint" />
-            <Array as="points" />
-            <mxPoint x="299.74" y="689" as="sourcePoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="0cJ1NAXk0Xtcf3CmwPfC-8" value="Extended template&amp;nbsp;&lt;div&gt;for anomaly detectors. Auto-detects and raises groups of point anomalies as group anomalies&lt;/div&gt;" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;shadow=1;align=left;fontStyle=1" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="50" y="1160" width="130" height="101" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-10" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="7JkVl93vQoOUYRVFK4Rs-1" target="4use4ZCXdNiZSNTW99xv-16">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-1" value="IBAnomaly (Anomaly)" style="swimlane;fontStyle=1;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;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;gradientColor=#F5F5F5;" vertex="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
-          <mxGeometry x="620" y="741" width="290" height="380" as="geometry">
-            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="K-uiR6WVb6SvZu_kqw6H-3" 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="7JkVl93vQoOUYRVFK4Rs-1" vertex="1">
-          <mxGeometry y="26" width="290" height="26" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-2" 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="7JkVl93vQoOUYRVFK4Rs-1">
-          <mxGeometry y="52" width="290" height="8" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-3" value="__init__( p_instances : list[Instance],&#xa;               p_visualize : bool = False,&#xa;               p_raising_object : object = None,&#xa;               p_det_time : str = None,&#xa;               p_deviation : float=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" vertex="1" parent="7JkVl93vQoOUYRVFK4Rs-1">
-          <mxGeometry y="60" width="290" height="100" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-4" value="_init_plot_2d( p_figure: Figure,&#xa;                       p_settings: PlotSettings,&#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;" vertex="1" parent="7JkVl93vQoOUYRVFK4Rs-1">
-          <mxGeometry y="160" width="290" height="50" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-5" value="_init_plot_3d( p_figure: Figure,&#xa;                       p_settings: PlotSettings,&#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;" vertex="1" parent="7JkVl93vQoOUYRVFK4Rs-1">
-          <mxGeometry y="210" width="290" height="50" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-6" value="_init_plot_nd( p_figure: Figure,&#xa;                       p_settings: PlotSettings,&#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;" vertex="1" parent="7JkVl93vQoOUYRVFK4Rs-1">
-          <mxGeometry y="260" width="290" height="50" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-7" value="_remove_plot_2d()" 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="7JkVl93vQoOUYRVFK4Rs-1">
-          <mxGeometry y="310" width="290" height="20" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-8" value="_remove_plot_3d()" 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="7JkVl93vQoOUYRVFK4Rs-1">
-          <mxGeometry y="330" width="290" height="20" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-9" value="_remove_plot_nd()" 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="7JkVl93vQoOUYRVFK4Rs-1">
-          <mxGeometry y="350" width="290" height="20" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-11" value="Sub-type for instance-based anomalies" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;shadow=1;align=left;fontStyle=1;verticalAlign=top;" vertex="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
-          <mxGeometry x="890" y="700" width="100" height="51" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-26" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="7JkVl93vQoOUYRVFK4Rs-12" target="4use4ZCXdNiZSNTW99xv-16">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="1175" y="680" />
-              <mxPoint x="765" y="680" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-12" value="CBAnomaly (Anomaly)" style="swimlane;fontStyle=1;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;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;gradientColor=#F5F5F5;" vertex="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
-          <mxGeometry x="1030" y="741" width="290" height="380" as="geometry">
-            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-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="7JkVl93vQoOUYRVFK4Rs-12">
-          <mxGeometry y="26" width="290" height="8" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-15" value="__init__( p_instances : list[Instance],&#xa;               p_visualize : bool = False,&#xa;               p_raising_object : object = None,&#xa;               p_det_time : str = None,&#xa;               p_deviation : float=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" vertex="1" parent="7JkVl93vQoOUYRVFK4Rs-12">
-          <mxGeometry y="34" width="290" height="100" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-16" value="_init_plot_2d( p_figure: Figure,&#xa;                       p_settings: PlotSettings,&#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;" vertex="1" parent="7JkVl93vQoOUYRVFK4Rs-12">
-          <mxGeometry y="134" width="290" height="50" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-17" value="_init_plot_3d( p_figure: Figure,&#xa;                       p_settings: PlotSettings,&#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;" vertex="1" parent="7JkVl93vQoOUYRVFK4Rs-12">
-          <mxGeometry y="184" width="290" height="50" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-18" value="_init_plot_nd( p_figure: Figure,&#xa;                       p_settings: PlotSettings,&#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;" vertex="1" parent="7JkVl93vQoOUYRVFK4Rs-12">
-          <mxGeometry y="234" width="290" height="50" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-19" value="_remove_plot_2d()" 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="7JkVl93vQoOUYRVFK4Rs-12">
-          <mxGeometry y="284" width="290" height="20" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-20" value="_remove_plot_3d()" 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="7JkVl93vQoOUYRVFK4Rs-12">
-          <mxGeometry y="304" width="290" height="20" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-21" value="_remove_plot_nd()" 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="7JkVl93vQoOUYRVFK4Rs-12">
-          <mxGeometry y="324" width="290" height="20" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-22" value="Sub-type for cluster-based anomalies" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;shadow=1;align=left;fontStyle=1;verticalAlign=top;" vertex="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
-          <mxGeometry x="1300" y="700" width="100" height="51" 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/30_anomaly_detection/images/MLPro-OA-Anomaly-Detectors_class_diagram.drawio b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/images/MLPro-OA-Anomaly-Detectors_class_diagram.drawio
index c01e69720..b5e6b091a 100644
--- a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/images/MLPro-OA-Anomaly-Detectors_class_diagram.drawio
+++ b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/images/MLPro-OA-Anomaly-Detectors_class_diagram.drawio
@@ -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">
+<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">
+    <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">
       <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="1180" y="40" width="490" height="220" as="geometry" />
+          <mxGeometry x="510" 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,8 +54,8 @@
         <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="AnomalyDetector&#xa;(OAStreamTask)" 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="150" y="60" width="350" height="563" as="geometry">
+        <mxCell id="4use4ZCXdNiZSNTW99xv-1" value="AnomalyDetector&#xa;(OAStreamTask)" 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="146" width="350" height="537" as="geometry">
             <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
@@ -83,32 +83,29 @@
         <mxCell id="N38WU9mJ-Era6qwWuLtT-0" value="_get_next_anomaly_id()" 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="284" width="350" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="4use4ZCXdNiZSNTW99xv-8" value="_get_anomalies() -&gt; dict[Anomaly]" 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;fontColor=default;" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
+        <mxCell id="oLJumqx1HHhM9YScGNT0-2" value="_buffer_anomaly(p_anomaly : Anomaly)" 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="314" width="350" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="oLJumqx1HHhM9YScGNT0-2" value="_buffer_anomaly(p_anomaly : Anomaly)" 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">
+        <mxCell id="oLJumqx1HHhM9YScGNT0-3" value="_remove_anomaly(p_anomaly : Anomaly)" 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="344" width="350" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="oLJumqx1HHhM9YScGNT0-3" value="_remove_anomaly(p_anomaly : Anomaly)" 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">
+        <mxCell id="oLJumqx1HHhM9YScGNT0-4" value="_raise_anomaly_event(p_anomaly : Anomaly)" 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="374" width="350" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="oLJumqx1HHhM9YScGNT0-4" value="_raise_anomaly_event(p_anomaly : Anomaly)" 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="404" width="350" height="30" as="geometry" />
+        <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;fontStyle=0" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
+          <mxGeometry y="404" width="350" height="40" 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;fontStyle=1" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
-          <mxGeometry y="434" width="350" height="40" as="geometry" />
+        <mxCell id="oLJumqx1HHhM9YScGNT0-6" value="update_plot( p_inst : InstDict = None, **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;fontStyle=0" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
+          <mxGeometry y="444" width="350" height="29" as="geometry" />
         </mxCell>
-        <mxCell id="oLJumqx1HHhM9YScGNT0-6" value="update_plot( p_inst : InstDict = None, **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;fontStyle=1" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
-          <mxGeometry y="474" width="350" height="29" as="geometry" />
+        <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;fontStyle=0" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
+          <mxGeometry y="473" width="350" height="30" 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;fontStyle=1" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
+        <mxCell id="hOcUKRqpv3udX4BvXm5B-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="503" width="350" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="hOcUKRqpv3udX4BvXm5B-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=1" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
-          <mxGeometry y="533" width="350" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="4use4ZCXdNiZSNTW99xv-16" value="Anomaly &#xa;(bf.various.Id, bf.events.Event, bf.plot.Plottable,&#xa;bf.math.normalizers.Renomalizable)" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=52;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=#FFFFFF;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="620" y="289" width="290" height="334" as="geometry">
+        <mxCell id="4use4ZCXdNiZSNTW99xv-16" value="Anomaly &#xa;(bf.various.Id, bf.events.Event, bf.plot.Plottable,&#xa;bf.math.normalizers.Renomalizable)" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=52;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="510" y="349" width="290" height="334" as="geometry">
             <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
           </mxGeometry>
         </mxCell>
@@ -133,208 +130,6 @@
         <mxCell id="4use4ZCXdNiZSNTW99xv-21" value="__init__( p_id : int = 0,&#xa;               p_tstamp : datetime = None,&#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="242" width="290" height="82" as="geometry" />
         </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-23" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="p2okAq9_pR5mkignAm-u-1" target="7JkVl93vQoOUYRVFK4Rs-1" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="p2okAq9_pR5mkignAm-u-1" value="PointAnomaly (IBAnomaly)" style="swimlane;fontStyle=1;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=3;fillColor=#f8cecc;strokeColor=#b85450;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;gradientColor=#F5F5F5;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="620" y="1240" width="290" height="369" as="geometry">
-            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="p2okAq9_pR5mkignAm-u-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=1;fillColor=#dae8fc;gradientColor=#ffffff;" parent="p2okAq9_pR5mkignAm-u-1" vertex="1">
-          <mxGeometry y="26" width="290" height="8" as="geometry" />
-        </mxCell>
-        <mxCell id="p2okAq9_pR5mkignAm-u-6" value="__init__( p_instance : Instance = None,&#xa;               p_ano_scores : list = None,&#xa;               p_visualize : bool = False,&#xa;               p_raising_object : object = None,&#xa;               p_det_time : str = None,&#xa;               p_deviation : float=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;" parent="p2okAq9_pR5mkignAm-u-1" vertex="1">
-          <mxGeometry y="34" width="290" height="110" as="geometry" />
-        </mxCell>
-        <mxCell id="oLJumqx1HHhM9YScGNT0-30" value="_init_plot_2d( p_figure: Figure,&#xa;                       p_settings: PlotSettings,&#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;" parent="p2okAq9_pR5mkignAm-u-1" vertex="1">
-          <mxGeometry y="144" width="290" height="50" as="geometry" />
-        </mxCell>
-        <mxCell id="N38WU9mJ-Era6qwWuLtT-4" value="_init_plot_3d( p_figure: Figure,&#xa;                       p_settings: PlotSettings,&#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;" parent="p2okAq9_pR5mkignAm-u-1" vertex="1">
-          <mxGeometry y="194" width="290" height="50" as="geometry" />
-        </mxCell>
-        <mxCell id="N38WU9mJ-Era6qwWuLtT-5" value="_init_plot_nd( p_figure: Figure,&#xa;                       p_settings: PlotSettings,&#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;" parent="p2okAq9_pR5mkignAm-u-1" vertex="1">
-          <mxGeometry y="244" width="290" height="50" as="geometry" />
-        </mxCell>
-        <mxCell id="oLJumqx1HHhM9YScGNT0-31" value="_remove_plot_2d()" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="p2okAq9_pR5mkignAm-u-1" vertex="1">
-          <mxGeometry y="294" width="290" height="20" as="geometry" />
-        </mxCell>
-        <mxCell id="N38WU9mJ-Era6qwWuLtT-6" value="_remove_plot_3d()" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="p2okAq9_pR5mkignAm-u-1" vertex="1">
-          <mxGeometry y="314" width="290" height="20" as="geometry" />
-        </mxCell>
-        <mxCell id="N38WU9mJ-Era6qwWuLtT-7" value="_remove_plot_nd()" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="p2okAq9_pR5mkignAm-u-1" vertex="1">
-          <mxGeometry y="334" width="290" height="20" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-24" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="y2l99iwQbg-wAnSwsQFK-0" target="7JkVl93vQoOUYRVFK4Rs-1" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="1135" y="1180" />
-              <mxPoint x="765" y="1180" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="y2l99iwQbg-wAnSwsQFK-0" value="GroupAnomaly (IBAnomaly)" style="swimlane;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=3;fillColor=#f8cecc;strokeColor=#b85450;swimlaneFillColor=#ffffff;gradientColor=#F5F5F5;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="990" y="1240" width="290" height="369" as="geometry">
-            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="y2l99iwQbg-wAnSwsQFK-2" 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="y2l99iwQbg-wAnSwsQFK-0" vertex="1">
-          <mxGeometry y="26" width="290" height="8" as="geometry" />
-        </mxCell>
-        <mxCell id="y2l99iwQbg-wAnSwsQFK-3" value="__init__( p_instances : Instance = None,&#xa;               p_ano_scores : list = None,&#xa;               p_visualize : bool = False,&#xa;               p_raising_object : object = None,&#xa;               p_det_time : str = None,&#xa;               p_mean : float = None,&#xa;               p_deviation : float=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;" parent="y2l99iwQbg-wAnSwsQFK-0" vertex="1">
-          <mxGeometry y="34" width="290" height="120" as="geometry" />
-        </mxCell>
-        <mxCell id="hOcUKRqpv3udX4BvXm5B-10" value="set_instances( p_instances : Instance,&#xa;                        p_ano_scores : list)" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="y2l99iwQbg-wAnSwsQFK-0" vertex="1">
-          <mxGeometry y="154" width="290" height="40" as="geometry" />
-        </mxCell>
-        <mxCell id="iRqbgX-deYLXcJWkZiLP-6" value="get_mean( ) -&gt; float" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="y2l99iwQbg-wAnSwsQFK-0" vertex="1">
-          <mxGeometry y="194" width="290" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="0cJ1NAXk0Xtcf3CmwPfC-10" value="get_mean_deviation( ) -&gt; float" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="y2l99iwQbg-wAnSwsQFK-0" vertex="1">
-          <mxGeometry y="224" width="290" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="oLJumqx1HHhM9YScGNT0-34" value="_init_plot_nd( 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;" parent="y2l99iwQbg-wAnSwsQFK-0" vertex="1">
-          <mxGeometry y="254" width="290" height="40" as="geometry" />
-        </mxCell>
-        <mxCell id="N38WU9mJ-Era6qwWuLtT-8" value="_update_plot_nd( p_settings: PlotSettings,&#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;" parent="y2l99iwQbg-wAnSwsQFK-0" vertex="1">
-          <mxGeometry y="294" width="290" height="40" as="geometry" />
-        </mxCell>
-        <mxCell id="N38WU9mJ-Era6qwWuLtT-14" value="_remove_plot_nd()" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="y2l99iwQbg-wAnSwsQFK-0" vertex="1">
-          <mxGeometry y="334" width="290" height="20" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-25" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="y2l99iwQbg-wAnSwsQFK-5" target="7JkVl93vQoOUYRVFK4Rs-1" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="1505" y="1180" />
-              <mxPoint x="765" y="1180" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="y2l99iwQbg-wAnSwsQFK-5" value="ContextualAnomaly (Anomaly)" style="swimlane;fontStyle=1;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;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;gradientColor=#F5F5F5;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="1360" y="1240" width="290" height="39" as="geometry">
-            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="y2l99iwQbg-wAnSwsQFK-7" 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="y2l99iwQbg-wAnSwsQFK-5" vertex="1">
-          <mxGeometry y="26" width="290" height="8" as="geometry" />
-        </mxCell>
-        <mxCell id="hOcUKRqpv3udX4BvXm5B-1" value="AnomalyDetectorPAGA&#xa;(AnomalyDetector)" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=42;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=1;strokeWidth=3;fillColor=#f8cecc;strokeColor=#b85450;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;gradientColor=#F5F5F5;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="150" y="1240" width="350" height="344" as="geometry">
-            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="hOcUKRqpv3udX4BvXm5B-2" value="C_TYPE = &#39;Anomaly Detector PAGA&#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="hOcUKRqpv3udX4BvXm5B-1" vertex="1">
-          <mxGeometry y="42" width="350" height="28" as="geometry" />
-        </mxCell>
-        <mxCell id="K-uiR6WVb6SvZu_kqw6H-8" value="_group_anomalies : list[Anomaly]" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="hOcUKRqpv3udX4BvXm5B-1" vertex="1">
-          <mxGeometry y="70" width="350" height="28" as="geometry" />
-        </mxCell>
-        <mxCell id="K-uiR6WVb6SvZu_kqw6H-9" value="_group_anomalies_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;" parent="hOcUKRqpv3udX4BvXm5B-1" vertex="1">
-          <mxGeometry y="98" width="350" height="28" as="geometry" />
-        </mxCell>
-        <mxCell id="K-uiR6WVb6SvZu_kqw6H-10" value="_group_ano_scores : list" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="hOcUKRqpv3udX4BvXm5B-1" vertex="1">
-          <mxGeometry y="126" width="350" height="28" as="geometry" />
-        </mxCell>
-        <mxCell id="K-uiR6WVb6SvZu_kqw6H-11" value="_group_anomaly_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;" parent="hOcUKRqpv3udX4BvXm5B-1" vertex="1">
-          <mxGeometry y="154" width="350" height="28" as="geometry" />
-        </mxCell>
-        <mxCell id="hOcUKRqpv3udX4BvXm5B-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="hOcUKRqpv3udX4BvXm5B-1" vertex="1">
-          <mxGeometry y="182" width="350" height="8" as="geometry" />
-        </mxCell>
-        <mxCell id="hOcUKRqpv3udX4BvXm5B-4" value="__init__( p_group_anomaly_det : bool = True,&#xa;               p_name : str = None,&#xa;               p_range_max=MLTask.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="hOcUKRqpv3udX4BvXm5B-1" vertex="1">
-          <mxGeometry y="190" width="350" height="124" as="geometry" />
-        </mxCell>
-        <mxCell id="hOcUKRqpv3udX4BvXm5B-5" value="_buffer_anomaly( p_anomaly : Anomaly)" 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="hOcUKRqpv3udX4BvXm5B-1" vertex="1">
-          <mxGeometry y="314" width="350" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="hOcUKRqpv3udX4BvXm5B-7" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fontColor=#0000FF;endArrow=block;endFill=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="hOcUKRqpv3udX4BvXm5B-1" target="4use4ZCXdNiZSNTW99xv-1" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <mxPoint x="410" y="661" as="targetPoint" />
-            <Array as="points" />
-            <mxPoint x="299.74" y="689" as="sourcePoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="0cJ1NAXk0Xtcf3CmwPfC-8" value="Extended template&amp;nbsp;&lt;div&gt;for anomaly detectors. Auto-detects and raises groups of point anomalies as group anomalies&lt;/div&gt;" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;shadow=1;align=left;fontStyle=1" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="50" y="1160" width="130" height="101" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-10" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="7JkVl93vQoOUYRVFK4Rs-1" target="4use4ZCXdNiZSNTW99xv-16" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-1" value="IBAnomaly (Anomaly)" style="swimlane;fontStyle=1;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;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;gradientColor=#F5F5F5;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="620" y="741" width="290" height="380" as="geometry">
-            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="K-uiR6WVb6SvZu_kqw6H-3" 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="7JkVl93vQoOUYRVFK4Rs-1" vertex="1">
-          <mxGeometry y="26" width="290" height="26" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-2" 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="7JkVl93vQoOUYRVFK4Rs-1" vertex="1">
-          <mxGeometry y="52" width="290" height="8" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-3" value="__init__( p_instances : list[Instance],&#xa;               p_visualize : bool = False,&#xa;               p_raising_object : object = None,&#xa;               p_det_time : str = None,&#xa;               p_deviation : float=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="7JkVl93vQoOUYRVFK4Rs-1" vertex="1">
-          <mxGeometry y="60" width="290" height="100" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-4" value="_init_plot_2d( p_figure: Figure,&#xa;                       p_settings: PlotSettings,&#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;" parent="7JkVl93vQoOUYRVFK4Rs-1" vertex="1">
-          <mxGeometry y="160" width="290" height="50" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-5" value="_init_plot_3d( p_figure: Figure,&#xa;                       p_settings: PlotSettings,&#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;" parent="7JkVl93vQoOUYRVFK4Rs-1" vertex="1">
-          <mxGeometry y="210" width="290" height="50" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-6" value="_init_plot_nd( p_figure: Figure,&#xa;                       p_settings: PlotSettings,&#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;" parent="7JkVl93vQoOUYRVFK4Rs-1" vertex="1">
-          <mxGeometry y="260" width="290" height="50" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-7" value="_remove_plot_2d()" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="7JkVl93vQoOUYRVFK4Rs-1" vertex="1">
-          <mxGeometry y="310" width="290" height="20" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-8" value="_remove_plot_3d()" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="7JkVl93vQoOUYRVFK4Rs-1" vertex="1">
-          <mxGeometry y="330" width="290" height="20" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-9" value="_remove_plot_nd()" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="7JkVl93vQoOUYRVFK4Rs-1" vertex="1">
-          <mxGeometry y="350" width="290" height="20" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-11" value="Sub-type for instance-based anomalies" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;shadow=1;align=left;fontStyle=1;verticalAlign=top;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="890" y="700" width="100" height="51" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-26" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="7JkVl93vQoOUYRVFK4Rs-12" target="4use4ZCXdNiZSNTW99xv-16" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="1175" y="680" />
-              <mxPoint x="765" y="680" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-12" value="CBAnomaly (Anomaly)" style="swimlane;fontStyle=1;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;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;gradientColor=#F5F5F5;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="1030" y="741" width="290" height="380" as="geometry">
-            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-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="7JkVl93vQoOUYRVFK4Rs-12" vertex="1">
-          <mxGeometry y="26" width="290" height="8" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-15" value="__init__( p_instances : list[Instance],&#xa;               p_visualize : bool = False,&#xa;               p_raising_object : object = None,&#xa;               p_det_time : str = None,&#xa;               p_deviation : float=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="7JkVl93vQoOUYRVFK4Rs-12" vertex="1">
-          <mxGeometry y="34" width="290" height="100" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-16" value="_init_plot_2d( p_figure: Figure,&#xa;                       p_settings: PlotSettings,&#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;" parent="7JkVl93vQoOUYRVFK4Rs-12" vertex="1">
-          <mxGeometry y="134" width="290" height="50" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-17" value="_init_plot_3d( p_figure: Figure,&#xa;                       p_settings: PlotSettings,&#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;" parent="7JkVl93vQoOUYRVFK4Rs-12" vertex="1">
-          <mxGeometry y="184" width="290" height="50" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-18" value="_init_plot_nd( p_figure: Figure,&#xa;                       p_settings: PlotSettings,&#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;" parent="7JkVl93vQoOUYRVFK4Rs-12" vertex="1">
-          <mxGeometry y="234" width="290" height="50" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-19" value="_remove_plot_2d()" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="7JkVl93vQoOUYRVFK4Rs-12" vertex="1">
-          <mxGeometry y="284" width="290" height="20" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-20" value="_remove_plot_3d()" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="7JkVl93vQoOUYRVFK4Rs-12" vertex="1">
-          <mxGeometry y="304" width="290" height="20" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-21" value="_remove_plot_nd()" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="7JkVl93vQoOUYRVFK4Rs-12" vertex="1">
-          <mxGeometry y="324" width="290" height="20" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-22" value="Sub-type for cluster-based anomalies" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;shadow=1;align=left;fontStyle=1;verticalAlign=top;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="1300" y="700" width="100" height="51" as="geometry" />
-        </mxCell>
       </root>
     </mxGraphModel>
   </diagram>
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/images/MLPro-OA-Anomaly-Detectors_class_diagram.drawio.png b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/images/MLPro-OA-Anomaly-Detectors_class_diagram.drawio.png
index 564cb3af5..3a64bc22e 100644
Binary files a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/images/MLPro-OA-Anomaly-Detectors_class_diagram.drawio.png and b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/images/MLPro-OA-Anomaly-Detectors_class_diagram.drawio.png differ
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/instance_based/images/MLPro-OA-Anomaly-Detectors-IB_class_diagram.drawio b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/instance_based/images/MLPro-OA-Anomaly-Detectors-IB_class_diagram.drawio
deleted file mode 100644
index b89e82e3d..000000000
--- a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/30_anomaly_detection/instance_based/images/MLPro-OA-Anomaly-Detectors-IB_class_diagram.drawio
+++ /dev/null
@@ -1,349 +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="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">
-      <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="1180" 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="AnomalyDetector&#xa;(OAStreamTask)" 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="150" y="60" width="350" height="563" as="geometry">
-            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="4use4ZCXdNiZSNTW99xv-2" value="C_TYPE                           = &#39;Anomaly 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;fontStyle=0;fontColor=default;" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
-          <mxGeometry y="41" width="350" height="26" 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;&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="67" width="350" height="24" 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="26" as="geometry" />
-        </mxCell>
-        <mxCell id="K-uiR6WVb6SvZu_kqw6H-5" value="_ano_id : int = 0" 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="117" width="350" height="24" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-0" value="anomalies : dict[Anomaly]" 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-1">
-          <mxGeometry y="141" 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="167" width="350" height="8" as="geometry" />
-        </mxCell>
-        <mxCell id="4use4ZCXdNiZSNTW99xv-6" value="__init__( p_name : str = None,&#xa;               p_range_max=MLTask.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="175" width="350" height="109" as="geometry" />
-        </mxCell>
-        <mxCell id="N38WU9mJ-Era6qwWuLtT-0" value="_get_next_anomaly_id()" 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="284" width="350" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="4use4ZCXdNiZSNTW99xv-8" value="_get_anomalies() -&gt; dict[Anomaly]" 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;fontColor=default;" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
-          <mxGeometry y="314" width="350" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="oLJumqx1HHhM9YScGNT0-2" value="_buffer_anomaly(p_anomaly : Anomaly)" 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="344" width="350" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="oLJumqx1HHhM9YScGNT0-3" value="_remove_anomaly(p_anomaly : Anomaly)" 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="374" width="350" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="oLJumqx1HHhM9YScGNT0-4" value="_raise_anomaly_event(p_anomaly : Anomaly)" 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="404" 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;fontStyle=1" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
-          <mxGeometry y="434" width="350" height="40" as="geometry" />
-        </mxCell>
-        <mxCell id="oLJumqx1HHhM9YScGNT0-6" value="update_plot( p_inst : InstDict = None, **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;fontStyle=1" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
-          <mxGeometry y="474" width="350" height="29" 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;fontStyle=1" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
-          <mxGeometry y="503" width="350" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="hOcUKRqpv3udX4BvXm5B-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=1" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1">
-          <mxGeometry y="533" width="350" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="4use4ZCXdNiZSNTW99xv-16" value="Anomaly &#xa;(bf.various.Id, bf.events.Event, bf.plot.Plottable,&#xa;bf.math.normalizers.Renomalizable)" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=52;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=#FFFFFF;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="620" y="289" width="290" height="334" as="geometry">
-            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="oLJumqx1HHhM9YScGNT0-23" 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="52" 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="78" width="290" height="26" as="geometry" />
-        </mxCell>
-        <mxCell id="oLJumqx1HHhM9YScGNT0-25" value="C_PLOT_VALID_VIEWS = &#xa;          [ PlotSettings.C_VIEW_2D, &#xa;            PlotSettings.C_VIEW_3D, &#xa;            PlotSettings.C_VIEW_ND ]" 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="104" width="290" height="67" as="geometry" />
-        </mxCell>
-        <mxCell id="oLJumqx1HHhM9YScGNT0-26" value="C_PLOT_DEFAULT_VIEW = &#xa;            PlotSettings.C_VIEW_ND" 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="171" width="290" height="37" as="geometry" />
-        </mxCell>
-        <mxCell id="K-uiR6WVb6SvZu_kqw6H-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="208" 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="234" width="290" height="8" as="geometry" />
-        </mxCell>
-        <mxCell id="4use4ZCXdNiZSNTW99xv-21" value="__init__( p_id : int = 0,&#xa;               p_tstamp : datetime = None,&#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="242" width="290" height="82" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-23" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="p2okAq9_pR5mkignAm-u-1" target="7JkVl93vQoOUYRVFK4Rs-1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="p2okAq9_pR5mkignAm-u-1" value="PointAnomaly (IBAnomaly)" style="swimlane;fontStyle=1;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=3;fillColor=#f8cecc;strokeColor=#b85450;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;gradientColor=#F5F5F5;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="620" y="1240" width="290" height="369" as="geometry">
-            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="p2okAq9_pR5mkignAm-u-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=1;fillColor=#dae8fc;gradientColor=#ffffff;" parent="p2okAq9_pR5mkignAm-u-1" vertex="1">
-          <mxGeometry y="26" width="290" height="8" as="geometry" />
-        </mxCell>
-        <mxCell id="p2okAq9_pR5mkignAm-u-6" value="__init__( p_instance : Instance = None,&#xa;               p_ano_scores : list = None,&#xa;               p_visualize : bool = False,&#xa;               p_raising_object : object = None,&#xa;               p_det_time : str = None,&#xa;               p_deviation : float=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;" parent="p2okAq9_pR5mkignAm-u-1" vertex="1">
-          <mxGeometry y="34" width="290" height="110" as="geometry" />
-        </mxCell>
-        <mxCell id="oLJumqx1HHhM9YScGNT0-30" value="_init_plot_2d( p_figure: Figure,&#xa;                       p_settings: PlotSettings,&#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;" parent="p2okAq9_pR5mkignAm-u-1" vertex="1">
-          <mxGeometry y="144" width="290" height="50" as="geometry" />
-        </mxCell>
-        <mxCell id="N38WU9mJ-Era6qwWuLtT-4" value="_init_plot_3d( p_figure: Figure,&#xa;                       p_settings: PlotSettings,&#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;" parent="p2okAq9_pR5mkignAm-u-1" vertex="1">
-          <mxGeometry y="194" width="290" height="50" as="geometry" />
-        </mxCell>
-        <mxCell id="N38WU9mJ-Era6qwWuLtT-5" value="_init_plot_nd( p_figure: Figure,&#xa;                       p_settings: PlotSettings,&#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;" parent="p2okAq9_pR5mkignAm-u-1" vertex="1">
-          <mxGeometry y="244" width="290" height="50" as="geometry" />
-        </mxCell>
-        <mxCell id="oLJumqx1HHhM9YScGNT0-31" value="_remove_plot_2d()" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="p2okAq9_pR5mkignAm-u-1" vertex="1">
-          <mxGeometry y="294" width="290" height="20" as="geometry" />
-        </mxCell>
-        <mxCell id="N38WU9mJ-Era6qwWuLtT-6" value="_remove_plot_3d()" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="p2okAq9_pR5mkignAm-u-1" vertex="1">
-          <mxGeometry y="314" width="290" height="20" as="geometry" />
-        </mxCell>
-        <mxCell id="N38WU9mJ-Era6qwWuLtT-7" value="_remove_plot_nd()" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="p2okAq9_pR5mkignAm-u-1" vertex="1">
-          <mxGeometry y="334" width="290" height="20" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-24" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="y2l99iwQbg-wAnSwsQFK-0" target="7JkVl93vQoOUYRVFK4Rs-1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="1135" y="1180" />
-              <mxPoint x="765" y="1180" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="y2l99iwQbg-wAnSwsQFK-0" value="GroupAnomaly (IBAnomaly)" style="swimlane;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=3;fillColor=#f8cecc;strokeColor=#b85450;swimlaneFillColor=#ffffff;gradientColor=#F5F5F5;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="990" y="1240" width="290" height="369" as="geometry">
-            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="y2l99iwQbg-wAnSwsQFK-2" 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="y2l99iwQbg-wAnSwsQFK-0" vertex="1">
-          <mxGeometry y="26" width="290" height="8" as="geometry" />
-        </mxCell>
-        <mxCell id="y2l99iwQbg-wAnSwsQFK-3" value="__init__( p_instances : Instance = None,&#xa;               p_ano_scores : list = None,&#xa;               p_visualize : bool = False,&#xa;               p_raising_object : object = None,&#xa;               p_det_time : str = None,&#xa;               p_mean : float = None,&#xa;               p_deviation : float=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;" parent="y2l99iwQbg-wAnSwsQFK-0" vertex="1">
-          <mxGeometry y="34" width="290" height="120" as="geometry" />
-        </mxCell>
-        <mxCell id="hOcUKRqpv3udX4BvXm5B-10" value="set_instances( p_instances : Instance,&#xa;                        p_ano_scores : list)" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="y2l99iwQbg-wAnSwsQFK-0" vertex="1">
-          <mxGeometry y="154" width="290" height="40" as="geometry" />
-        </mxCell>
-        <mxCell id="iRqbgX-deYLXcJWkZiLP-6" value="get_mean( ) -&gt; float" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="y2l99iwQbg-wAnSwsQFK-0" vertex="1">
-          <mxGeometry y="194" width="290" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="0cJ1NAXk0Xtcf3CmwPfC-10" value="get_mean_deviation( ) -&gt; float" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="y2l99iwQbg-wAnSwsQFK-0" vertex="1">
-          <mxGeometry y="224" width="290" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="oLJumqx1HHhM9YScGNT0-34" value="_init_plot_nd( 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;" parent="y2l99iwQbg-wAnSwsQFK-0" vertex="1">
-          <mxGeometry y="254" width="290" height="40" as="geometry" />
-        </mxCell>
-        <mxCell id="N38WU9mJ-Era6qwWuLtT-8" value="_update_plot_nd( p_settings: PlotSettings,&#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;" parent="y2l99iwQbg-wAnSwsQFK-0" vertex="1">
-          <mxGeometry y="294" width="290" height="40" as="geometry" />
-        </mxCell>
-        <mxCell id="N38WU9mJ-Era6qwWuLtT-14" value="_remove_plot_nd()" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="y2l99iwQbg-wAnSwsQFK-0" vertex="1">
-          <mxGeometry y="334" width="290" height="20" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-25" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="y2l99iwQbg-wAnSwsQFK-5" target="7JkVl93vQoOUYRVFK4Rs-1">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="1505" y="1180" />
-              <mxPoint x="765" y="1180" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="y2l99iwQbg-wAnSwsQFK-5" value="ContextualAnomaly (Anomaly)" style="swimlane;fontStyle=1;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;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;gradientColor=#F5F5F5;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="1360" y="1240" width="290" height="39" as="geometry">
-            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="y2l99iwQbg-wAnSwsQFK-7" 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="y2l99iwQbg-wAnSwsQFK-5" vertex="1">
-          <mxGeometry y="26" width="290" height="8" as="geometry" />
-        </mxCell>
-        <mxCell id="hOcUKRqpv3udX4BvXm5B-1" value="AnomalyDetectorPAGA&#xa;(AnomalyDetector)" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=42;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=1;strokeWidth=3;fillColor=#f8cecc;strokeColor=#b85450;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;gradientColor=#F5F5F5;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="150" y="1240" width="350" height="344" as="geometry">
-            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="hOcUKRqpv3udX4BvXm5B-2" value="C_TYPE = &#39;Anomaly Detector PAGA&#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="hOcUKRqpv3udX4BvXm5B-1" vertex="1">
-          <mxGeometry y="42" width="350" height="28" as="geometry" />
-        </mxCell>
-        <mxCell id="K-uiR6WVb6SvZu_kqw6H-8" value="_group_anomalies : list[Anomaly]" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="hOcUKRqpv3udX4BvXm5B-1" vertex="1">
-          <mxGeometry y="70" width="350" height="28" as="geometry" />
-        </mxCell>
-        <mxCell id="K-uiR6WVb6SvZu_kqw6H-9" value="_group_anomalies_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;" parent="hOcUKRqpv3udX4BvXm5B-1" vertex="1">
-          <mxGeometry y="98" width="350" height="28" as="geometry" />
-        </mxCell>
-        <mxCell id="K-uiR6WVb6SvZu_kqw6H-10" value="_group_ano_scores : list" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="hOcUKRqpv3udX4BvXm5B-1" vertex="1">
-          <mxGeometry y="126" width="350" height="28" as="geometry" />
-        </mxCell>
-        <mxCell id="K-uiR6WVb6SvZu_kqw6H-11" value="_group_anomaly_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;" parent="hOcUKRqpv3udX4BvXm5B-1" vertex="1">
-          <mxGeometry y="154" width="350" height="28" as="geometry" />
-        </mxCell>
-        <mxCell id="hOcUKRqpv3udX4BvXm5B-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="hOcUKRqpv3udX4BvXm5B-1" vertex="1">
-          <mxGeometry y="182" width="350" height="8" as="geometry" />
-        </mxCell>
-        <mxCell id="hOcUKRqpv3udX4BvXm5B-4" value="__init__( p_group_anomaly_det : bool = True,&#xa;               p_name : str = None,&#xa;               p_range_max=MLTask.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="hOcUKRqpv3udX4BvXm5B-1" vertex="1">
-          <mxGeometry y="190" width="350" height="124" as="geometry" />
-        </mxCell>
-        <mxCell id="hOcUKRqpv3udX4BvXm5B-5" value="_buffer_anomaly( p_anomaly : Anomaly)" 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="hOcUKRqpv3udX4BvXm5B-1" vertex="1">
-          <mxGeometry y="314" width="350" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="hOcUKRqpv3udX4BvXm5B-7" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fontColor=#0000FF;endArrow=block;endFill=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="hOcUKRqpv3udX4BvXm5B-1" target="4use4ZCXdNiZSNTW99xv-1" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <mxPoint x="410" y="661" as="targetPoint" />
-            <Array as="points" />
-            <mxPoint x="299.74" y="689" as="sourcePoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="0cJ1NAXk0Xtcf3CmwPfC-8" value="Extended template&amp;nbsp;&lt;div&gt;for anomaly detectors. Auto-detects and raises groups of point anomalies as group anomalies&lt;/div&gt;" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;shadow=1;align=left;fontStyle=1" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
-          <mxGeometry x="50" y="1160" width="130" height="101" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-10" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="7JkVl93vQoOUYRVFK4Rs-1" target="4use4ZCXdNiZSNTW99xv-16">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-1" value="IBAnomaly (Anomaly)" style="swimlane;fontStyle=1;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;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;gradientColor=#F5F5F5;" vertex="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
-          <mxGeometry x="620" y="741" width="290" height="380" as="geometry">
-            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="K-uiR6WVb6SvZu_kqw6H-3" 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="7JkVl93vQoOUYRVFK4Rs-1" vertex="1">
-          <mxGeometry y="26" width="290" height="26" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-2" 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="7JkVl93vQoOUYRVFK4Rs-1">
-          <mxGeometry y="52" width="290" height="8" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-3" value="__init__( p_instances : list[Instance],&#xa;               p_visualize : bool = False,&#xa;               p_raising_object : object = None,&#xa;               p_det_time : str = None,&#xa;               p_deviation : float=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" vertex="1" parent="7JkVl93vQoOUYRVFK4Rs-1">
-          <mxGeometry y="60" width="290" height="100" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-4" value="_init_plot_2d( p_figure: Figure,&#xa;                       p_settings: PlotSettings,&#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;" vertex="1" parent="7JkVl93vQoOUYRVFK4Rs-1">
-          <mxGeometry y="160" width="290" height="50" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-5" value="_init_plot_3d( p_figure: Figure,&#xa;                       p_settings: PlotSettings,&#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;" vertex="1" parent="7JkVl93vQoOUYRVFK4Rs-1">
-          <mxGeometry y="210" width="290" height="50" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-6" value="_init_plot_nd( p_figure: Figure,&#xa;                       p_settings: PlotSettings,&#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;" vertex="1" parent="7JkVl93vQoOUYRVFK4Rs-1">
-          <mxGeometry y="260" width="290" height="50" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-7" value="_remove_plot_2d()" 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="7JkVl93vQoOUYRVFK4Rs-1">
-          <mxGeometry y="310" width="290" height="20" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-8" value="_remove_plot_3d()" 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="7JkVl93vQoOUYRVFK4Rs-1">
-          <mxGeometry y="330" width="290" height="20" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-9" value="_remove_plot_nd()" 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="7JkVl93vQoOUYRVFK4Rs-1">
-          <mxGeometry y="350" width="290" height="20" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-11" value="Sub-type for instance-based anomalies" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;shadow=1;align=left;fontStyle=1;verticalAlign=top;" vertex="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
-          <mxGeometry x="890" y="700" width="100" height="51" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-26" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="7JkVl93vQoOUYRVFK4Rs-12" target="4use4ZCXdNiZSNTW99xv-16">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="1175" y="680" />
-              <mxPoint x="765" y="680" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-12" value="CBAnomaly (Anomaly)" style="swimlane;fontStyle=1;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;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;gradientColor=#F5F5F5;" vertex="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
-          <mxGeometry x="1030" y="741" width="290" height="380" as="geometry">
-            <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-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="7JkVl93vQoOUYRVFK4Rs-12">
-          <mxGeometry y="26" width="290" height="8" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-15" value="__init__( p_instances : list[Instance],&#xa;               p_visualize : bool = False,&#xa;               p_raising_object : object = None,&#xa;               p_det_time : str = None,&#xa;               p_deviation : float=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" vertex="1" parent="7JkVl93vQoOUYRVFK4Rs-12">
-          <mxGeometry y="34" width="290" height="100" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-16" value="_init_plot_2d( p_figure: Figure,&#xa;                       p_settings: PlotSettings,&#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;" vertex="1" parent="7JkVl93vQoOUYRVFK4Rs-12">
-          <mxGeometry y="134" width="290" height="50" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-17" value="_init_plot_3d( p_figure: Figure,&#xa;                       p_settings: PlotSettings,&#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;" vertex="1" parent="7JkVl93vQoOUYRVFK4Rs-12">
-          <mxGeometry y="184" width="290" height="50" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-18" value="_init_plot_nd( p_figure: Figure,&#xa;                       p_settings: PlotSettings,&#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;" vertex="1" parent="7JkVl93vQoOUYRVFK4Rs-12">
-          <mxGeometry y="234" width="290" height="50" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-19" value="_remove_plot_2d()" 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="7JkVl93vQoOUYRVFK4Rs-12">
-          <mxGeometry y="284" width="290" height="20" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-20" value="_remove_plot_3d()" 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="7JkVl93vQoOUYRVFK4Rs-12">
-          <mxGeometry y="304" width="290" height="20" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-21" value="_remove_plot_nd()" 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="7JkVl93vQoOUYRVFK4Rs-12">
-          <mxGeometry y="324" width="290" height="20" as="geometry" />
-        </mxCell>
-        <mxCell id="7JkVl93vQoOUYRVFK4Rs-22" value="Sub-type for cluster-based anomalies" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;shadow=1;align=left;fontStyle=1;verticalAlign=top;" vertex="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
-          <mxGeometry x="1300" y="700" width="100" height="51" 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/31_anomaly_prediction/10_anomaly_predictors.rst.off b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/31_anomaly_prediction.off/10_anomaly_predictors.rst.off
similarity index 100%
rename from doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/31_anomaly_prediction/10_anomaly_predictors.rst.off
rename to doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/31_anomaly_prediction.off/10_anomaly_predictors.rst.off
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/31_anomaly_prediction/images/MLPro-OA_Anomaly_Predictors_class_diagram.drawio b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/31_anomaly_prediction.off/images/MLPro-OA_Anomaly_Predictors_class_diagram.drawio
similarity index 100%
rename from doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/31_anomaly_prediction/images/MLPro-OA_Anomaly_Predictors_class_diagram.drawio
rename to doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/31_anomaly_prediction.off/images/MLPro-OA_Anomaly_Predictors_class_diagram.drawio
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/31_anomaly_prediction/images/MLPro-OA_Anomaly_Predictors_class_diagram.drawio.png b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/31_anomaly_prediction.off/images/MLPro-OA_Anomaly_Predictors_class_diagram.drawio.png
similarity index 100%
rename from doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/31_anomaly_prediction/images/MLPro-OA_Anomaly_Predictors_class_diagram.drawio.png
rename to doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/31_anomaly_prediction.off/images/MLPro-OA_Anomaly_Predictors_class_diagram.drawio.png
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection.rst
new file mode 100644
index 000000000..ace896105
--- /dev/null
+++ b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection.rst
@@ -0,0 +1,27 @@
+.. _target_api_oa_stream_tasks_dd:
+Drift detection
+===============
+
+.. image:: images/MLPro-OA-Drift-Detectors_class_diagram.drawio.png
+   :scale: 50%
+   
+   
+.. automodule:: mlpro.oa.streams.tasks.driftydetectors.basics
+   :members:
+   :undoc-members:
+   :private-members:
+   :show-inheritance:
+
+
+.. automodule:: mlpro.oa.streams.tasks.driftdetectors.drifts.basics
+   :members:
+   :undoc-members:
+   :private-members:
+   :show-inheritance:
+
+
+.. toctree::
+   :maxdepth: 2
+   :glob:
+   
+   40_drift_detection/*
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/instance_based/anomalies/03_drift.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/instance_based/anomalies/03_drift.rst
new file mode 100644
index 000000000..9ad3c0558
--- /dev/null
+++ b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/streams/40_drift_detection/instance_based/anomalies/03_drift.rst
@@ -0,0 +1,9 @@
+.. _target_api_oa_stream_tasks_dd_common_anomalies_drift:
+Drift
+=====
+  
+.. automodule:: mlpro.oa.streams.tasks.driftdetectors.anomalies.drift
+   :members:
+   :undoc-members:
+   :private-members:
+   :show-inheritance:
\ No newline at end of file
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/systems/01_basics.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/systems.off/01_basics.rst
similarity index 100%
rename from doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/systems/01_basics.rst
rename to doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/systems.off/01_basics.rst
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/systems/images/MLPro-OA-Systems_OASystems.drawio.png b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/systems.off/images/MLPro-OA-Systems_OASystems.drawio.png
similarity index 100%
rename from doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/systems/images/MLPro-OA-Systems_OASystems.drawio.png
rename to doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/systems.off/images/MLPro-OA-Systems_OASystems.drawio.png
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/systems/images/MLPro-OA-Systems_OASystems_class_diagram.drawio b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/systems.off/images/MLPro-OA-Systems_OASystems_class_diagram.drawio
similarity index 100%
rename from doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/systems/images/MLPro-OA-Systems_OASystems_class_diagram.drawio
rename to doc/rtd/content/99_appendices/appendix2/sub/mlpro_oa/systems.off/images/MLPro-OA-Systems_OASystems_class_diagram.drawio
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_sl/10_basics.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_sl/10_basics.rst
index b67264e65..01dc40290 100644
--- a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_sl/10_basics.rst
+++ b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_sl/10_basics.rst
@@ -1,6 +1,6 @@
 .. _target_api_sl:
-SL - Basics
-===========
+Basics
+======
 
 .. image:: images/MLPro-SL-Basics_class_diagram.drawio.png
    :scale: 50%
diff --git a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_sl/20_fnn.rst b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_sl/20_fnn.rst
index 448a84107..ba281a350 100644
--- a/doc/rtd/content/99_appendices/appendix2/sub/mlpro_sl/20_fnn.rst
+++ b/doc/rtd/content/99_appendices/appendix2/sub/mlpro_sl/20_fnn.rst
@@ -1,6 +1,6 @@
 .. _target_api_sl_fnn:
-SL - Feedforward Neural Network
-===================================
+MLPro-SL-FNN - Feedforward neural network
+=========================================
 
 .. image:: images/MLPro-SL-FNN_class_diagram.drawio.png
    :scale: 50%
diff --git a/doc/rtd/index.rst b/doc/rtd/index.rst
index 2fa4e2926..97f7d371b 100644
--- a/doc/rtd/index.rst
+++ b/doc/rtd/index.rst
@@ -27,51 +27,51 @@ MLPro - Elevate your machine learning journey
 
 
 .. |welcome| image:: content/00_start_page/images/welcome.png
-   :scale: 33 %
+   :scale: 34 %
    :target: content/01_welcome/main.html
 
 .. |mlpro_bf| image:: content/00_start_page/images/mlpro_bf.png
-   :scale: 33 %
+   :scale: 34 %
    :target: content/02_basic_functions/mlpro_bf/main.html
    
 .. |mlpro_sl| image:: content/00_start_page/images/mlpro_sl.png
-   :scale: 33 %
+   :scale: 34 %
    :target: content/03_machine_learning/mlpro_sl/main.html
 
 .. |mlpro_rl| image:: content/00_start_page/images/mlpro_rl.png
-   :scale: 33 %
+   :scale: 34 %
    :target: content/03_machine_learning/mlpro_rl/main.html
 
 .. |mlpro_gt| image:: content/00_start_page/images/mlpro_gt.png
-   :scale: 33 %
+   :scale: 34 %
    :target: content/03_machine_learning/mlpro_gt/main.html
 
 .. |mlpro_oa| image:: content/00_start_page/images/mlpro_oa.png
-   :scale: 33 %
+   :scale: 34 %
    :target: content/03_machine_learning/mlpro_oa/main.html
 
 .. |examples| image:: content/00_start_page/images/example_pool.png
-   :scale: 33 %
+   :scale: 34 %
    :target: content/99_appendices/appendix1/main.html
 
 .. |podcast| image:: content/00_start_page/images/podcast.png
-   :scale: 33 %
+   :scale: 34 %
    :target: https://www.gitpodcast.com/fhswf/mlpro
 
 .. |chatgpt| image:: content/00_start_page/images/chatgpt.png
-   :scale: 33 %
+   :scale: 34 %
    :target: https://chatgpt.com/g/g-67a1b30e91d481918ee1d6fe2af91bb5-mlpro
 
 .. |mlpro_api| image:: content/00_start_page/images/api_reference.png
-   :scale: 33 %
+   :scale: 34 %
    :target: content/99_appendices/appendix2/main.html
 
 .. |extensions| image:: content/00_start_page/images/extension_hub.png
-   :scale: 33 %
+   :scale: 34 %
    :target: content/04_extensions/main.html
 
 .. |project| image:: content/00_start_page/images/project_mlpro.png
-   :scale: 33 %
+   :scale: 34 %
    :target: content/99_appendices/appendix3/main.html
 
 
diff --git a/src/mlpro/oa/streams/tasks/anomalydetectors/anomalies/instancebased/__init__.py b/src/mlpro/oa/streams/tasks/anomalydetectors/anomalies/instancebased/__init__.py
index 702e77b54..ec55f5cae 100644
--- a/src/mlpro/oa/streams/tasks/anomalydetectors/anomalies/instancebased/__init__.py
+++ b/src/mlpro/oa/streams/tasks/anomalydetectors/anomalies/instancebased/__init__.py
@@ -1,3 +1,4 @@
+from mlpro.oa.streams.tasks.anomalydetectors.anomalies.instancebased.basics import AnomalyIB
 from mlpro.oa.streams.tasks.anomalydetectors.anomalies.instancebased.point import PointAnomaly
 from mlpro.oa.streams.tasks.anomalydetectors.anomalies.instancebased.group import GroupAnomaly
 from mlpro.oa.streams.tasks.anomalydetectors.anomalies.instancebased.contextual import ContextualAnomaly
\ No newline at end of file
diff --git a/src/mlpro/oa/streams/tasks/anomalydetectors/anomalies/instancebased/basics.py b/src/mlpro/oa/streams/tasks/anomalydetectors/anomalies/instancebased/basics.py
new file mode 100644
index 000000000..a615bbbb2
--- /dev/null
+++ b/src/mlpro/oa/streams/tasks/anomalydetectors/anomalies/instancebased/basics.py
@@ -0,0 +1,41 @@
+## -------------------------------------------------------------------------------------------------
+## -- Project : MLPro - The integrative middleware framework for standardized machine learning
+## -- Package : mlpro.oa.tasks.anomalydetectors.anomalies.instancebased
+## -- Module  : basics.py
+## -------------------------------------------------------------------------------------------------
+## -- History :
+## -- yyyy-mm-dd  Ver.      Auth.    Description
+## -- 2025-02-28  1.0.0     DA       Creation
+## -------------------------------------------------------------------------------------------------
+
+"""
+Ver. 1.0.0 (2025-02-28)
+
+This module provides a template class for instance-based anomalies to be used in anomaly detection algorithms.
+"""
+
+
+from mlpro.bf.streams import Instance
+from mlpro.oa.streams.tasks.anomalydetectors.anomalies.basics import Anomaly
+
+
+
+
+## -------------------------------------------------------------------------------------------------
+## -------------------------------------------------------------------------------------------------
+class AnomalyIB ( Anomaly ):
+    """
+    This is the base class for instance-based anomaly events.
+    """
+
+## -------------------------------------------------------------------------------------------------
+    def __init__( self, 
+                  p_instances : list[Instance],
+                  p_id = 0, 
+                  p_tstamp = None, 
+                  p_visualize = False, 
+                  p_raising_object = None, 
+                  **p_kwargs ):
+        
+        super().__init__(p_id, p_tstamp, p_visualize, p_raising_object, **p_kwargs)
+        self.instances = p_instances
\ No newline at end of file
diff --git a/src/mlpro/oa/streams/tasks/anomalydetectors/anomalies/instancebased/contextual.py b/src/mlpro/oa/streams/tasks/anomalydetectors/anomalies/instancebased/contextual.py
index 28e5dd81e..487807494 100644
--- a/src/mlpro/oa/streams/tasks/anomalydetectors/anomalies/instancebased/contextual.py
+++ b/src/mlpro/oa/streams/tasks/anomalydetectors/anomalies/instancebased/contextual.py
@@ -1,6 +1,6 @@
 ## -------------------------------------------------------------------------------------------------
 ## -- Project : MLPro - The integrative middleware framework for standardized machine learning
-## -- Package : mlpro.oa.tasks.anomalydetectors.anomalies
+## -- Package : mlpro.oa.tasks.anomalydetectors.anomalies.instancebased
 ## -- Module  : contextual.py
 ## -------------------------------------------------------------------------------------------------
 ## -- History :
@@ -8,25 +8,24 @@
 ## -- 2023-06-08  0.0.0     SK       Creation
 ## -- 2023-09-12  1.0.0     SK       Release
 ## -- 2024-04-10  1.2.0     DA/SK    Refactoring
+## -- 2025-02-28  1.3.0     DA       Refactoring
 ## -------------------------------------------------------------------------------------------------
 
 """
-Ver. 1.2.0 (2024-04-10)
+Ver. 1.3.0 (2025-02-28)
 
 This module provides a template class for contextual anomaly to be used in anomaly detection algorithms.
 """
 
-from mlpro.oa.streams.tasks.anomalydetectors.anomalies.basics import Anomaly
+from mlpro.oa.streams.tasks.anomalydetectors.anomalies.instancebased.basics import AnomalyIB
 
 
 
 ## -------------------------------------------------------------------------------------------------
 ## -------------------------------------------------------------------------------------------------
-class ContextualAnomaly (Anomaly):
+class ContextualAnomaly (AnomalyIB):
     """
-    Event class for anomaly events when contextual anomalies are detected
-
+    Event class for contextual anomaly events.
     """
 
-    C_NAME      = 'Contextual'
-
+    pass
\ No newline at end of file
diff --git a/src/mlpro/oa/streams/tasks/anomalydetectors/anomalies/instancebased/group.py b/src/mlpro/oa/streams/tasks/anomalydetectors/anomalies/instancebased/group.py
index 903f76a2d..975f35592 100644
--- a/src/mlpro/oa/streams/tasks/anomalydetectors/anomalies/instancebased/group.py
+++ b/src/mlpro/oa/streams/tasks/anomalydetectors/anomalies/instancebased/group.py
@@ -1,6 +1,6 @@
 ## -------------------------------------------------------------------------------------------------
 ## -- Project : MLPro - The integrative middleware framework for standardized machine learning
-## -- Package : mlpro.oa.tasks.anomalydetectors.anomalies
+## -- Package : mlpro.oa.tasks.anomalydetectors.anomalies.instancebased
 ## -- Module  : group.py
 ## -------------------------------------------------------------------------------------------------
 ## -- History :
@@ -22,6 +22,8 @@
 This module provides a template class for group anomaly to be used in anomaly detection algorithms.
 """
 
+from datetime import datetime
+
 try:
     from matplotlib.figure import Figure
     from matplotlib.text import Text
@@ -33,58 +35,52 @@ class patches : pass
     
 from mlpro.bf.plot import PlotSettings
 from mlpro.bf.streams import Instance
-from mlpro.oa.streams.tasks.anomalydetectors.anomalies.basics import Anomaly
+from mlpro.oa.streams.tasks.anomalydetectors.anomalies.instancebased.basics import AnomalyIB
 
 
 
 ## -------------------------------------------------------------------------------------------------
 ## -------------------------------------------------------------------------------------------------
-class GroupAnomaly (Anomaly):
+class GroupAnomaly (AnomalyIB):
     """
     Event class for anomaly events when group anomalies are detected.
     
     Parameters
     ----------
-    p_id : int
-        Anomaly ID. Default value = 0.
     p_instances : Instance
         List of instances. Default value = None.
-    p_ano_scores : list
-        List of anomaly scores of instances. Default = None.
-    p_det_time : str
+    p_id : int
+        Anomaly ID. Default value = 0.
+    p_tstamp : datetime = None
         Time of occurance of anomaly. Default = None.
-    p_mean : float
-        The mean value of the anomaly. Default = None.
-    p_mean_deviation : float
-        The mean deviation of the anomaly. Default = None.
     p_visualize : bool
         Boolean switch for visualisation. Default = False.
     p_raising_object : object
         Reference of the object raised. Default = None.
+    p_mean : float
+        The mean value of the anomaly. Default = None.
+    p_mean_deviation : float
+        The mean deviation of the anomaly. Default = None.
     **p_kwargs
         Further optional keyword arguments.
     """
 
-    C_NAME      = 'Group'
-
 ## -------------------------------------------------------------------------------------------------
     def __init__(self,
+                 p_instances : list[Instance],
                  p_id = 0,
-                 p_instances : list[Instance] = None,
-                 p_ano_scores : list = None,
-                 p_det_time : str = None,
-                 p_mean : float= None,
-                 p_mean_deviation : float = None,
+                 p_tstamp : datetime = None,
                  p_visualize : bool = False,
                  p_raising_object : object = None,
+                 p_mean : float= None,
+                 p_mean_deviation : float = None,
                  **p_kwargs):
         
-        super().__init__( p_id = p_id, 
-                          p_instances = p_instances, 
-                          p_ano_scores = p_ano_scores,
+        super().__init__( p_instances = p_instances, 
+                          p_id = p_id, 
                           p_visualize = p_visualize, 
                           p_raising_object = p_raising_object,
-                          p_det_time = p_det_time, 
+                          p_tstamp = p_tstamp,
                           **p_kwargs )
         
         self.plot_update = True
@@ -93,23 +89,7 @@ def __init__(self,
 
 
 ## -------------------------------------------------------------------------------------------------
-    def set_instances(self, p_instances = None, p_ano_scores = None):
-        """
-        Method to set the instances associated with the anomaly.
-        
-        Parameters
-        ----------
-        p_instances : list[Instance]
-            List of instances. Default is None.
-        p_ano_scores : list
-            List of anomaly scores.
-        """
-        self._instances = p_instances
-        self._ano_scores = p_ano_scores
-
-
-## -------------------------------------------------------------------------------------------------
-    def get_mean(self) -> float:
+    def _get_mean(self) -> float:
         """
         Method that returns the mean value of the anomaly.
         
@@ -122,7 +102,7 @@ def get_mean(self) -> float:
 
 
 ## -------------------------------------------------------------------------------------------------
-    def get_mean_deviation(self) -> float:
+    def _get_mean_deviation(self) -> float:
         """
         Method that returns the mean deviation of anomaly from the normal distribution of data.
         
@@ -155,17 +135,15 @@ def _update_plot_nd(self, p_settings: PlotSettings, **p_kwargs):
         """
         if not self.plot_update: return
 
-        my_instances = self.get_instances()
-    
-        x1 = my_instances[0]
-        x2 = my_instances[-1]
+        x1 = self.instances[0]
+        x2 = self.instances[-1]
 
-        x1 = x1.get_id()
-        x2 = x2.get_id()
+        x1 = x1.id
+        x2 = x2.id
         a=[]
         b=[]
 
-        for instance in my_instances:
+        for instance in self.instances:
             a.append(instance.get_feature_data().get_values())
 
         for x in a:
@@ -175,7 +153,7 @@ def _update_plot_nd(self, p_settings: PlotSettings, **p_kwargs):
         y2 = max(b)
 
         if self._rect is None:
-            label = self.C_NAME[0]
+            label = 'G'
             self._rect = patches.Rectangle((x1, y1), x2 - x1, y2 - y1, linewidth=1, edgecolor='black', facecolor='yellow', alpha=0.5)
             self._plot_rectangle = p_settings.axes.add_patch(self._rect)
             self._plot_rectangle_t = p_settings.axes.text((x1+x2)/2, 0, label, color='b' )
@@ -198,3 +176,7 @@ def _remove_plot_nd(self):
         if self._plot_rectangle is not None: self._plot_rectangle .remove()
         if self._plot_rectangle_t is not None: self._plot_rectangle_t.remove()
 
+
+## -------------------------------------------------------------------------------------------------
+    mean            = property( fget = _get_mean )
+    mean_deviation  = property( fget = _get_mean_deviation )
\ No newline at end of file
diff --git a/src/mlpro/oa/streams/tasks/anomalydetectors/anomalies/instancebased/point.py b/src/mlpro/oa/streams/tasks/anomalydetectors/anomalies/instancebased/point.py
index 23bf65507..4f48de558 100644
--- a/src/mlpro/oa/streams/tasks/anomalydetectors/anomalies/instancebased/point.py
+++ b/src/mlpro/oa/streams/tasks/anomalydetectors/anomalies/instancebased/point.py
@@ -1,6 +1,6 @@
 ## -------------------------------------------------------------------------------------------------
 ## -- Project : MLPro - The integrative middleware framework for standardized machine learning
-## -- Package : mlpro.oa.tasks.anomalydetectors.anomalies
+## -- Package : mlpro.oa.tasks.anomalydetectors.anomalies.instancebased
 ## -- Module  : point.py
 ## -------------------------------------------------------------------------------------------------
 ## -- History :
@@ -9,10 +9,11 @@
 ## -- 2023-09-12  1.0.0     SK       Release
 ## -- 2024-04-10  1.2.0     DA/SK    Refactoring
 ## -- 2024-12-11  1.2.1     DA       Pseudo classes if matplotlib is not installed
+## -- 2025-02-28  1.3.0     DA       Refactoring and simplification
 ## -------------------------------------------------------------------------------------------------
 
 """
-Ver. 1.2.1 (2024-12-11)
+Ver. 1.3.0 (2025-02-28)
 
 
 This module provides a template class for point anomaly event to be used in anomaly detection algorithms.
@@ -26,76 +27,20 @@ class Figure : pass
     class Text : pass
     
 from mlpro.bf.plot import PlotSettings
-from mlpro.bf.streams import Instance
-from mlpro.oa.streams.tasks.anomalydetectors.anomalies.basics import Anomaly
+from mlpro.oa.streams.tasks.anomalydetectors.anomalies.instancebased.basics import AnomalyIB
 
 
 
 ## -------------------------------------------------------------------------------------------------
 ## -------------------------------------------------------------------------------------------------
-class PointAnomaly (Anomaly):
+class PointAnomaly (AnomalyIB):
     """
-    Event class for anomaly events when point anomalies are detected.
-    
-    Parameters
-    ----------
-    p_id : int
-        Anomaly ID. Default value = 0.
-    p_instances : Instance
-        List of instances. Default value = None.
-    p_ano_scores : list
-        List of anomaly scores of instances. Default = None.
-    p_det_time : str
-        Time of occurance of anomaly. Default = None.
-    p_deviation : float
-        The deviation of the anomaly. Default = None.
-    p_visualize : bool
-        Boolean switch for visualisation. Default = False.
-    p_raising_object : object
-        Reference of the object raised. Default = None.
-    **p_kwargs
-        Further optional keyword arguments.
+    Sub-type for point anomalies including a particular visualization.
     """
 
-    C_NAME              = 'Point'
-
     C_PLOT_CH_SIZE      = 0.06           # Crosshair size in % of visible axes area
     C_PLOT_CH_OFFSET    = 0.4            # Crosshair distance from the center in [0,1]
 
-## -------------------------------------------------------------------------------------------------
-    def __init__(self,
-                 p_id = 0,
-                 p_instances : list[Instance] = None,
-                 p_ano_scores : list = None,
-                 p_det_time : str = None,
-                 p_deviation : float = None,
-                 p_visualize : bool = False,
-                 p_raising_object : object = None,
-                 **p_kwargs):
-        
-        super().__init__( p_id=p_id,
-                          p_instances=p_instances, 
-                          p_ano_scores=p_ano_scores,
-                          p_visualize=p_visualize, 
-                          p_raising_object=p_raising_object,
-                          p_det_time=p_det_time, 
-                          **p_kwargs )
-        
-        self._deviation = p_deviation
-        
-
-## -------------------------------------------------------------------------------------------------
-    def get_deviation(self) -> float:
-        """
-        Method that returns the deviation of anomaly from the normal distribution of data.
-        
-        Returns
-        -------
-        float
-            The devaition of anomaly from the normal data distribution.
-        """
-        return self._instances
-
 ## -------------------------------------------------------------------------------------------------
     def _init_plot_2d(self, p_figure: Figure, p_settings: PlotSettings):
         self._plot_line_x1 = None
@@ -123,7 +68,7 @@ def _update_plot_2d(self, p_settings: PlotSettings, p_axlimits_changed: bool, p_
 
         if ( self._plot_line_x1 is not None ) and not p_axlimits_changed: return
 
-        inst = self.get_instances()[-1]
+        inst = self.instances[-1]
         feature_values = inst.get_feature_data().get_values()
 
         len_x          = ( p_xlim[1] - p_xlim[0] ) * self.C_PLOT_CH_SIZE / 2
@@ -165,7 +110,7 @@ def _update_plot_3d(self, p_settings: PlotSettings, p_axlimits_changed: bool, p_
 
         if ( self._plot_line_x1 is not None ) and not p_axlimits_changed: return
 
-        inst = self.get_instances()[-1]
+        inst = self.instances[-1]
         feature_values = inst.get_feature_data().get_values()
 
         len_x          = ( p_xlim[1] - p_xlim[0] ) * self.C_PLOT_CH_SIZE / 2
@@ -226,7 +171,7 @@ def _update_plot_nd(self, p_settings: PlotSettings, p_axlimits_changed: bool, p_
         if ( self._plot_line is not None ) and not p_axlimits_changed: return
         
 
-        inst = self.get_instances()[-1]
+        inst = self.instances[-1]
 
         inst_id = inst.get_id()
         xpos    = [inst_id, inst_id]
diff --git a/src/mlpro/oa/streams/tasks/anomalydetectors/instancebased/__init__.py b/src/mlpro/oa/streams/tasks/anomalydetectors/instancebased/__init__.py
index 44730f5e1..a9a1546ef 100644
--- a/src/mlpro/oa/streams/tasks/anomalydetectors/instancebased/__init__.py
+++ b/src/mlpro/oa/streams/tasks/anomalydetectors/instancebased/__init__.py
@@ -1 +1,2 @@
-from mlpro.oa.streams.tasks.anomalydetectors.instancebased.paga_detectors import AnomalyDetectorPAGA
\ No newline at end of file
+from mlpro.oa.streams.tasks.anomalydetectors.instancebased.basics import AnomalyDetectorIB
+from mlpro.oa.streams.tasks.anomalydetectors.instancebased.detectors_point_group import AnomalyDetectorIBPG
\ No newline at end of file
diff --git a/src/mlpro/oa/streams/tasks/anomalydetectors/instancebased/basics.py b/src/mlpro/oa/streams/tasks/anomalydetectors/instancebased/basics.py
new file mode 100644
index 000000000..0f94588e4
--- /dev/null
+++ b/src/mlpro/oa/streams/tasks/anomalydetectors/instancebased/basics.py
@@ -0,0 +1,29 @@
+## -------------------------------------------------------------------------------------------------
+## -- Project : MLPro - The integrative middleware framework for standardized machine learning
+## -- Package : mlpro.oa.streams.tasks.anomalydetectors.instancebased
+## -- Module  : basics.py
+## -------------------------------------------------------------------------------------------------
+## -- History :
+## -- yyyy-mm-dd  Ver.      Auth.    Description
+## -- 2025-02-28  1.0.0     DA       Creation
+## -------------------------------------------------------------------------------------------------
+
+"""
+Ver. 1.0.0 (2025-02-28)
+
+This module provides MLPro's template class for instance-based anomaly detectors.
+"""
+
+
+from mlpro.oa.streams.tasks.anomalydetectors.basics import AnomalyDetector
+
+
+
+## -------------------------------------------------------------------------------------------------
+## -------------------------------------------------------------------------------------------------
+class AnomalyDetectorIB (AnomalyDetector):
+    """
+    This class is a sub-type template for instance-based anomaly detectors.
+    """
+
+    C_TYPE = 'Anomaly Detector (IB)'
\ No newline at end of file
diff --git a/src/mlpro/oa/streams/tasks/anomalydetectors/instancebased/paga_detectors.py b/src/mlpro/oa/streams/tasks/anomalydetectors/instancebased/detectors_point_group.py
similarity index 86%
rename from src/mlpro/oa/streams/tasks/anomalydetectors/instancebased/paga_detectors.py
rename to src/mlpro/oa/streams/tasks/anomalydetectors/instancebased/detectors_point_group.py
index 12d4dc078..1b7a82f3c 100644
--- a/src/mlpro/oa/streams/tasks/anomalydetectors/instancebased/paga_detectors.py
+++ b/src/mlpro/oa/streams/tasks/anomalydetectors/instancebased/detectors_point_group.py
@@ -1,7 +1,7 @@
 ## -------------------------------------------------------------------------------------------------
 ## -- Project : MLPro - The integrative middleware framework for standardized machine learning
-## -- Package : mlpro.oa.streams.tasks.anomalydetectors
-## -- Module  : paga_detectors.py
+## -- Package : mlpro.oa.streams.tasks.anomalydetectors.instancebased
+## -- Module  : detectors_point_group.py
 ## -------------------------------------------------------------------------------------------------
 ## -- History :
 ## -- yyyy-mm-dd  Ver.      Auth.    Description
@@ -14,12 +14,13 @@
 ## -- 2024-08-12  1.3.0     DA       Review and adjustments on documentation
 ## -- 2025-02-14  1.4.0     DA       Refactoring
 ## -- 2025-02-17  1.5.0     DA       Review and generalization
+## -- 2025-02-28  1.6.0     DA       Refactoring and simplification
 ## -------------------------------------------------------------------------------------------------
 
 """
-Ver. 1.5.0 (2025-02-17)
+Ver. 1.6.0 (2025-02-28)
 
-This module provides an extended template for custom anomaly detectors that supports an optional
+This module provides an extended template for instance-based anomaly detectors that supports an optional
 group anomaly detection based on point anomalies.
 """
 
@@ -28,14 +29,15 @@
 from mlpro.bf.streams import Instance
 
 from mlpro.oa.streams.basics import StreamTask
-from mlpro.oa.streams.tasks.anomalydetectors.basics import AnomalyDetector
+from mlpro.oa.streams.tasks.anomalydetectors.instancebased.basics import AnomalyDetectorIB
 from mlpro.oa.streams.tasks.anomalydetectors.anomalies import Anomaly, PointAnomaly, GroupAnomaly
 
 
 
+
 ## -------------------------------------------------------------------------------------------------
 ## -------------------------------------------------------------------------------------------------
-class AnomalyDetectorPAGA (AnomalyDetector):
+class AnomalyDetectorIBPG (AnomalyDetectorIB):
     """
     This class is an extended template offering an optional group anomaly detection based on point 
     anomalies. This detection can be turned on/off via the p_group_anomaly_det parameter. See 
@@ -61,7 +63,7 @@ class AnomalyDetectorPAGA (AnomalyDetector):
         Further optional named parameters.
     """
 
-    C_TYPE = 'Anomaly Detector PAGA'
+    C_TYPE = 'Anomaly Detector (IBPG)'
 
 ## -------------------------------------------------------------------------------------------------
     def __init__( self,
@@ -84,7 +86,6 @@ def __init__( self,
         
         self._group_anomalies : list[Anomaly] = []
         self._group_anomalies_instances : list[Instance] = []
-        self._group_ano_scores  = []
         self._group_anomaly_det = p_group_anomaly_det
 
 
@@ -105,8 +106,7 @@ def _buffer_anomaly(self, p_anomaly):
 
         if self._group_anomaly_det:
             self._group_anomalies.append(p_anomaly)
-            self._group_anomalies_instances.append(p_anomaly.get_instances()[-1])
-            self._group_ano_scores.append(p_anomaly.get_ano_scores())
+            self._group_anomalies_instances.append(p_anomaly.instances[-1])
 
             if len(self._group_anomalies_instances) > 1:
 
@@ -124,7 +124,7 @@ def _buffer_anomaly(self, p_anomaly):
 
                         self._ano_id -= 2
                         groupanomaly = GroupAnomaly( p_instances = self._group_anomalies_instances,
-                                                     p_ano_scores = self._group_ano_scores, p_visualize=self._visualize,
+                                                     p_visualize=self._visualize,
                                                      p_raising_object = self,
                                                      p_tstampt = inst_2.tstamp )
                             
@@ -134,7 +134,7 @@ def _buffer_anomaly(self, p_anomaly):
                         self._group_anomalies.append(groupanomaly)
 
                     elif len(self._group_anomalies_instances) > 3:
-                        self._group_anomalies[0].set_instances(self._group_anomalies_instances, self._group_ano_scores)
+                        self._group_anomalies[0].instances = self._group_anomalies_instances
                         self._group_anomalies.pop(-1)
                         return self._group_anomalies[0]
                             
@@ -147,10 +147,9 @@ def _buffer_anomaly(self, p_anomaly):
                             groupanomaly.plot_update = False
                     self._group_anomalies = []
                     self._group_anomalies_instances = []
-                    self._group_ano_scores = []
                     self._group_anomalies.append(p_anomaly)
-                    self._group_anomalies_instances.append(p_anomaly.get_instances()[-1])
-                    self._group_ano_scores.append(p_anomaly.get_ano_scores())
+                    self._group_anomalies_instances.append(p_anomaly.instances[-1])
                     super()._buffer_anomaly( p_anomaly = p_anomaly )
+
             else:
                 super()._buffer_anomaly( p_anomaly = p_anomaly)            
\ No newline at end of file
diff --git a/src/mlpro/oa/streams/tasks/anomalypredictors/__init__.py.off b/src/mlpro/oa/streams/tasks/anomalypredictors.off/__init__.py.off
similarity index 100%
rename from src/mlpro/oa/streams/tasks/anomalypredictors/__init__.py.off
rename to src/mlpro/oa/streams/tasks/anomalypredictors.off/__init__.py.off
diff --git a/src/mlpro/oa/streams/tasks/anomalypredictors/basics.py b/src/mlpro/oa/streams/tasks/anomalypredictors.off/basics.py
similarity index 100%
rename from src/mlpro/oa/streams/tasks/anomalypredictors/basics.py
rename to src/mlpro/oa/streams/tasks/anomalypredictors.off/basics.py
diff --git a/src/mlpro/oa/streams/tasks/anomalypredictors/tsf/__init__.py.off b/src/mlpro/oa/streams/tasks/anomalypredictors.off/tsf/__init__.py.off
similarity index 100%
rename from src/mlpro/oa/streams/tasks/anomalypredictors/tsf/__init__.py.off
rename to src/mlpro/oa/streams/tasks/anomalypredictors.off/tsf/__init__.py.off
diff --git a/src/mlpro/oa/streams/tasks/anomalypredictors/tsf/ad_based.py b/src/mlpro/oa/streams/tasks/anomalypredictors.off/tsf/ad_based.py
similarity index 100%
rename from src/mlpro/oa/streams/tasks/anomalypredictors/tsf/ad_based.py
rename to src/mlpro/oa/streams/tasks/anomalypredictors.off/tsf/ad_based.py
diff --git a/src/mlpro/oa/streams/tasks/anomalypredictors/tsf/basics.py b/src/mlpro/oa/streams/tasks/anomalypredictors.off/tsf/basics.py
similarity index 100%
rename from src/mlpro/oa/streams/tasks/anomalypredictors/tsf/basics.py
rename to src/mlpro/oa/streams/tasks/anomalypredictors.off/tsf/basics.py
diff --git a/src/mlpro/oa/streams/tasks/anomalypredictors/tsf/mini_batch_based.py b/src/mlpro/oa/streams/tasks/anomalypredictors.off/tsf/mini_batch_based.py
similarity index 100%
rename from src/mlpro/oa/streams/tasks/anomalypredictors/tsf/mini_batch_based.py
rename to src/mlpro/oa/streams/tasks/anomalypredictors.off/tsf/mini_batch_based.py
diff --git a/src/mlpro/oa/streams/tasks/driftdetectors/clusterbased/__init__.py b/src/mlpro/oa/streams/tasks/driftdetectors/clusterbased/__init__.py
index a4f80c4ae..bd98e8346 100644
--- a/src/mlpro/oa/streams/tasks/driftdetectors/clusterbased/__init__.py
+++ b/src/mlpro/oa/streams/tasks/driftdetectors/clusterbased/__init__.py
@@ -1,2 +1,2 @@
 from mlpro.oa.streams.tasks.driftdetectors.clusterbased.basics import DriftDetectorCB
-from mlpro.oa.streams.tasks.driftdetectors.clusterbased.movement import DriftDetectorCBMovement
\ No newline at end of file
+#from mlpro.oa.streams.tasks.driftdetectors.clusterbased.movement import DriftDetectorCBMovement
\ No newline at end of file