diff --git a/README.md b/README.md
index 07c5f1b..2e19e22 100644
--- a/README.md
+++ b/README.md
@@ -64,352 +64,6 @@ This repository contains an index (see below) of all the approved powers within
   - **class Model** | [Details](src/7f40cc7d-9ab8-4601-8a2b-4eb3d712a40a) | [Code](src/7f40cc7d-9ab8-4601-8a2b-4eb3d712a40a/code.php) | [Settings](src/7f40cc7d-9ab8-4601-8a2b-4eb3d712a40a/settings.json) | Super__7f40cc7d_9ab8_4601_8a2b_4eb3d712a40a__Power
   - **class Search** | [Details](src/da714ea5-96bb-4eb1-959b-39b457be9cd1) | [Code](src/da714ea5-96bb-4eb1-959b-39b457be9cd1/code.php) | [Settings](src/da714ea5-96bb-4eb1-959b-39b457be9cd1/settings.json) | Super__da714ea5_96bb_4eb1_959b_39b457be9cd1__Power
 
-# Class Diagrams
-
-## VDM Joomla Componentbuilder Search
-> namespace VDM\Joomla\Componentbuilder\Search
-```uml
-@startuml
-
-namespace VDM\Joomla\Componentbuilder\Search #Olive {
-
-
-  abstract Factory  #Orange {
-    # static $container
-    + {static} _() : Mixed
-    + {static} getContainer() : Container
-    # {static} createContainer() : Container
-  }
-
-  class Agent  #Gold {
-    # Config $config
-    # Load $load
-    # Insert $insert
-    # Find $find
-    # Replace $replace
-    # Search $search
-    # Update $update
-    # Table $table
-    # string $return
-    # array $marker
-    # array $markerHtml
-    + __construct()
-    + getValue() : ?string
-    + setValue() : bool
-    + table() : ?array
-    + find() : ?array
-    + replace() : int
-    # getRow() : array
-    # getRowCode() : string
-    # getRowEditButton() : string
-    # setReturnValue() : void
-    # setMarkers() : void
-  }
-
-  class Config  #Gold {
-    # getTypesearch() : ?int
-    # getSearchvalue() : ?string
-    # getReplacevalue() : string
-    # getMatchcase() : int
-    # getWholeword() : int
-    # getRegexsearch() : int
-    # getComponentid() : int
-    # getTablename() : ?string
-    # getFieldname() : ?string
-    # getItemid() : int
-    # getFieldcounter() : int
-    # getLinecounter() : int
-    # getMarkerstart() : string
-    # getMarkerend() : string
-  }
-}
-
-
-@enduml
-```
-
-## VDM Joomla Componentbuilder Search Abstraction
-> namespace VDM\Joomla\Componentbuilder\Search\Abstraction
-```uml
-@startuml
-
-namespace VDM\Joomla\Componentbuilder\Search\Abstraction #LightGreen {
-
-
-  abstract Engine  #Orange {
-    # Config $config
-    # ?string $searchValue
-    # string $replaceValue
-    # int $matchCase
-    # int $wholeWord
-    # string $start
-    # string $end
-    + __construct()
-    # lineCounter()
-  }
-}
-
-
-@enduml
-```
-
-## VDM Joomla Componentbuilder Search Agent
-> namespace VDM\Joomla\Componentbuilder\Search\Agent
-```uml
-@startuml
-
-namespace VDM\Joomla\Componentbuilder\Search\Agent #LightGreen {
-
-
-  class Find  #Gold {
-    # array $found
-    # Config $config
-    # Search $search
-    + __construct()
-    + get() : ?array
-    + item() : void
-    + items() : void
-    + reset() : void
-  }
-
-  class Replace  #Gold {
-    # array $updated
-    # Config $config
-    # Update $update
-    + __construct()
-    + get() : ?array
-    + item() : void
-    + items() : void
-    + reset() : void
-  }
-
-  class Search  #Gold {
-    # array $found
-    # Config $config
-    # SearchEngine $search
-    + __construct()
-    + get() : ?array
-    + value() : bool
-    + reset() : void
-    # searchValue() : ?array
-    # string() : ?array
-    # prep() : void
-    # fieldCounter()
-  }
-
-  class Update  #Gold {
-    # SearchEngine $search
-    + __construct()
-    + value() : mixed
-    # updateValue() : mixed
-    # validateUpdateKey() : bool
-    # string() : string
-  }
-}
-
-
-@enduml
-```
-
-## VDM Joomla Componentbuilder Search Database
-> namespace VDM\Joomla\Componentbuilder\Search\Database
-```uml
-@startuml
-
-namespace VDM\Joomla\Componentbuilder\Search\Database #LightGreen {
-
-
-  class Insert  #Gold {
-    # Config $config
-    # Table $table
-    # Model $model
-    # \JDatabaseDriver $db
-    + __construct()
-    + value() : bool
-    + item() : bool
-    + items() : bool
-  }
-
-  class Load  #Gold {
-    # int $bundle
-    # Config $config
-    # Table $table
-    # Model $model
-    # Database $load
-    + __construct()
-    + value() : mixed
-    + item() : ?object
-    + items() : ?array
-    # next() : int
-    # incremental() : int
-    # setDatabaseFields() : ?array
-  }
-}
-
-
-@enduml
-```
-
-## VDM Joomla Componentbuilder Search Engine
-> namespace VDM\Joomla\Componentbuilder\Search\Engine
-```uml
-@startuml
-
-namespace VDM\Joomla\Componentbuilder\Search\Engine #LightGreen {
-
-
-  class Basic  #Gold {
-    # string $regexValue
-    + __construct()
-    + string() : ?string
-    + replace() : string
-    # replaceWhole() : string
-    # searchWhole() : ?string
-    + match() : bool
-    # searchAll() : ?string
-    # replaceAll() : string
-  }
-
-  class Regex  #Gold {
-    # string $regexValue
-    + __construct()
-    + string() : ?string
-    + replace() : string
-    + match() : bool
-  }
-}
-
-
-@enduml
-```
-
-## VDM Joomla Componentbuilder Search Interfaces
-> namespace VDM\Joomla\Componentbuilder\Search\Interfaces
-```uml
-@startuml
-
-namespace VDM\Joomla\Componentbuilder\Search\Interfaces #LightGreen {
-
-
-  interface FindInterface  #Lavender {
-    + get() : ?array
-    + item() : void
-    + items() : void
-    + reset() : void
-  }
-
-  interface InsertInterface  #Lavender {
-    + value() : bool
-    + item() : bool
-    + items() : bool
-  }
-
-  interface LoadInterface  #Lavender {
-    + value() : mixed
-    + item() : ?object
-    + items() : ?array
-  }
-
-  interface ReplaceInterface  #Lavender {
-    + get() : ?array
-    + item() : void
-    + items() : void
-    + reset() : void
-  }
-
-  interface SearchInterface  #Lavender {
-    + get() : ?array
-    + value() : bool
-    + reset() : void
-  }
-
-  interface SearchTypeInterface  #Lavender {
-    + string() : ?string
-    + replace() : string
-  }
-}
-
-
-@enduml
-```
-
-## VDM Joomla Componentbuilder Search Model
-> namespace VDM\Joomla\Componentbuilder\Search\Model
-```uml
-@startuml
-
-namespace VDM\Joomla\Componentbuilder\Search\Model #LightGreen {
-
-
-  class Insert  #Gold {
-    # Config $config
-    + __construct()
-    + value() : mixed
-    # validateBefore() : bool
-    # validateAfter() : bool
-    # getTable() : string
-  }
-
-  class Load  #Gold {
-    # Config $config
-    + __construct()
-    + value() : mixed
-    # validateBefore() : bool
-    # validateAfter() : bool
-    # getTable() : string
-  }
-}
-
-
-@enduml
-```
-
-## VDM Joomla Componentbuilder Search Service
-> namespace VDM\Joomla\Componentbuilder\Search\Service
-```uml
-@startuml
-
-namespace VDM\Joomla\Componentbuilder\Search\Service #LightGreen {
-
-
-  class Agent  #Gold {
-    + register() : void
-    + getAgent() : SearchAgent
-    + getFind() : Find
-    + getReplace() : Replace
-    + getSearch() : Search
-    + getUpdate() : Update
-  }
-
-  class Database  #Gold {
-    + register() : void
-    + getLoad() : Load
-    + getDatabaseLoad() : LoadDatabase
-    + getDatabaseInsert() : InsertDatabase
-  }
-
-  class Model  #Gold {
-    + register() : void
-    + getModelLoad() : Load
-    + getModelInsert() : Insert
-  }
-
-  class Search  #Gold {
-    # $searchEngine
-    + register() : void
-    + getConfig() : Config
-    + getTable() : Table
-    + getRegex() : Regex
-    + getBasic() : Basic
-    + getSearch() : SearchEngine
-  }
-}
-
-
-@enduml
-```
-
-
 ---
 ```
      ██╗ ██████╗  ██████╗ ███╗   ███╗██╗      █████╗
diff --git a/super-powers.json b/super-powers.json
index 381ae5c..607fe67 100644
--- a/super-powers.json
+++ b/super-powers.json
@@ -1,80 +1,14 @@
 {
-    "6e2ca779-f70e-4871-a138-0ee5eaec6a97": {
-        "name": "Config",
-        "type": "class",
-        "namespace": "VDM\\Joomla\\Componentbuilder\\Search",
-        "code": "src\/6e2ca779-f70e-4871-a138-0ee5eaec6a97\/code.php",
-        "power": "src\/6e2ca779-f70e-4871-a138-0ee5eaec6a97\/code.power",
-        "settings": "src\/6e2ca779-f70e-4871-a138-0ee5eaec6a97\/settings.json",
-        "path": "src\/6e2ca779-f70e-4871-a138-0ee5eaec6a97",
-        "spk": "Super__6e2ca779_f70e_4871_a138_0ee5eaec6a97__Power",
-        "guid": "6e2ca779-f70e-4871-a138-0ee5eaec6a97"
-    },
-    "117d8c9e-3f8d-40ae-b375-1efa2fe5538a": {
-        "name": "SearchTypeInterface",
-        "type": "interface",
-        "namespace": "VDM\\Joomla\\Componentbuilder\\Search\\Interfaces",
-        "code": "src\/117d8c9e-3f8d-40ae-b375-1efa2fe5538a\/code.php",
-        "power": "src\/117d8c9e-3f8d-40ae-b375-1efa2fe5538a\/code.power",
-        "settings": "src\/117d8c9e-3f8d-40ae-b375-1efa2fe5538a\/settings.json",
-        "path": "src\/117d8c9e-3f8d-40ae-b375-1efa2fe5538a",
-        "spk": "Super__117d8c9e_3f8d_40ae_b375_1efa2fe5538a__Power",
-        "guid": "117d8c9e-3f8d-40ae-b375-1efa2fe5538a"
-    },
-    "8f9449fc-bfbc-49a5-b146-d58c8c17dfdf": {
-        "name": "Engine",
+    "01a89ba8-f8bb-435c-93de-0a8f3fa9432a": {
+        "name": "Factory",
         "type": "abstract class",
-        "namespace": "VDM\\Joomla\\Componentbuilder\\Search\\Abstraction",
-        "code": "src\/8f9449fc-bfbc-49a5-b146-d58c8c17dfdf\/code.php",
-        "power": "src\/8f9449fc-bfbc-49a5-b146-d58c8c17dfdf\/code.power",
-        "settings": "src\/8f9449fc-bfbc-49a5-b146-d58c8c17dfdf\/settings.json",
-        "path": "src\/8f9449fc-bfbc-49a5-b146-d58c8c17dfdf",
-        "spk": "Super__8f9449fc_bfbc_49a5_b146_d58c8c17dfdf__Power",
-        "guid": "8f9449fc-bfbc-49a5-b146-d58c8c17dfdf"
-    },
-    "83efa9a0-4aec-41f8-9c05-b1ac9617746e": {
-        "name": "Regex",
-        "type": "class",
-        "namespace": "VDM\\Joomla\\Componentbuilder\\Search\\Engine",
-        "code": "src\/83efa9a0-4aec-41f8-9c05-b1ac9617746e\/code.php",
-        "power": "src\/83efa9a0-4aec-41f8-9c05-b1ac9617746e\/code.power",
-        "settings": "src\/83efa9a0-4aec-41f8-9c05-b1ac9617746e\/settings.json",
-        "path": "src\/83efa9a0-4aec-41f8-9c05-b1ac9617746e",
-        "spk": "Super__83efa9a0_4aec_41f8_9c05_b1ac9617746e__Power",
-        "guid": "83efa9a0-4aec-41f8-9c05-b1ac9617746e"
-    },
-    "db093eca-63b3-4d6c-9232-3ceb058121c0": {
-        "name": "Basic",
-        "type": "class",
-        "namespace": "VDM\\Joomla\\Componentbuilder\\Search\\Engine",
-        "code": "src\/db093eca-63b3-4d6c-9232-3ceb058121c0\/code.php",
-        "power": "src\/db093eca-63b3-4d6c-9232-3ceb058121c0\/code.power",
-        "settings": "src\/db093eca-63b3-4d6c-9232-3ceb058121c0\/settings.json",
-        "path": "src\/db093eca-63b3-4d6c-9232-3ceb058121c0",
-        "spk": "Super__db093eca_63b3_4d6c_9232_3ceb058121c0__Power",
-        "guid": "db093eca-63b3-4d6c-9232-3ceb058121c0"
-    },
-    "da714ea5-96bb-4eb1-959b-39b457be9cd1": {
-        "name": "Search",
-        "type": "class",
-        "namespace": "VDM\\Joomla\\Componentbuilder\\Search\\Service",
-        "code": "src\/da714ea5-96bb-4eb1-959b-39b457be9cd1\/code.php",
-        "power": "src\/da714ea5-96bb-4eb1-959b-39b457be9cd1\/code.power",
-        "settings": "src\/da714ea5-96bb-4eb1-959b-39b457be9cd1\/settings.json",
-        "path": "src\/da714ea5-96bb-4eb1-959b-39b457be9cd1",
-        "spk": "Super__da714ea5_96bb_4eb1_959b_39b457be9cd1__Power",
-        "guid": "da714ea5-96bb-4eb1-959b-39b457be9cd1"
-    },
-    "f523ab49-907a-4356-b064-51c85a187fbd": {
-        "name": "Load",
-        "type": "class",
-        "namespace": "VDM\\Joomla\\Componentbuilder\\Search\\Model",
-        "code": "src\/f523ab49-907a-4356-b064-51c85a187fbd\/code.php",
-        "power": "src\/f523ab49-907a-4356-b064-51c85a187fbd\/code.power",
-        "settings": "src\/f523ab49-907a-4356-b064-51c85a187fbd\/settings.json",
-        "path": "src\/f523ab49-907a-4356-b064-51c85a187fbd",
-        "spk": "Super__f523ab49_907a_4356_b064_51c85a187fbd__Power",
-        "guid": "f523ab49-907a-4356-b064-51c85a187fbd"
+        "namespace": "VDM\\Joomla\\Componentbuilder\\Search",
+        "code": "src\/01a89ba8-f8bb-435c-93de-0a8f3fa9432a\/code.php",
+        "power": "src\/01a89ba8-f8bb-435c-93de-0a8f3fa9432a\/code.power",
+        "settings": "src\/01a89ba8-f8bb-435c-93de-0a8f3fa9432a\/settings.json",
+        "path": "src\/01a89ba8-f8bb-435c-93de-0a8f3fa9432a",
+        "spk": "Super__01a89ba8_f8bb_435c_93de_0a8f3fa9432a__Power",
+        "guid": "01a89ba8-f8bb-435c-93de-0a8f3fa9432a"
     },
     "02efe40a-7792-4c82-9444-7d0377243483": {
         "name": "Insert",
@@ -87,16 +21,49 @@
         "spk": "Super__02efe40a_7792_4c82_9444_7d0377243483__Power",
         "guid": "02efe40a-7792-4c82-9444-7d0377243483"
     },
-    "7f40cc7d-9ab8-4601-8a2b-4eb3d712a40a": {
-        "name": "Model",
+    "0b658434-3767-401e-addc-eabfd1d0e94a": {
+        "name": "Agent",
         "type": "class",
-        "namespace": "VDM\\Joomla\\Componentbuilder\\Search\\Service",
-        "code": "src\/7f40cc7d-9ab8-4601-8a2b-4eb3d712a40a\/code.php",
-        "power": "src\/7f40cc7d-9ab8-4601-8a2b-4eb3d712a40a\/code.power",
-        "settings": "src\/7f40cc7d-9ab8-4601-8a2b-4eb3d712a40a\/settings.json",
-        "path": "src\/7f40cc7d-9ab8-4601-8a2b-4eb3d712a40a",
-        "spk": "Super__7f40cc7d_9ab8_4601_8a2b_4eb3d712a40a__Power",
-        "guid": "7f40cc7d-9ab8-4601-8a2b-4eb3d712a40a"
+        "namespace": "VDM\\Joomla\\Componentbuilder\\Search",
+        "code": "src\/0b658434-3767-401e-addc-eabfd1d0e94a\/code.php",
+        "power": "src\/0b658434-3767-401e-addc-eabfd1d0e94a\/code.power",
+        "settings": "src\/0b658434-3767-401e-addc-eabfd1d0e94a\/settings.json",
+        "path": "src\/0b658434-3767-401e-addc-eabfd1d0e94a",
+        "spk": "Super__0b658434_3767_401e_addc_eabfd1d0e94a__Power",
+        "guid": "0b658434-3767-401e-addc-eabfd1d0e94a"
+    },
+    "0d9442ab-54d9-4947-a219-244cfaea3084": {
+        "name": "SearchInterface",
+        "type": "interface",
+        "namespace": "VDM\\Joomla\\Componentbuilder\\Search\\Interfaces",
+        "code": "src\/0d9442ab-54d9-4947-a219-244cfaea3084\/code.php",
+        "power": "src\/0d9442ab-54d9-4947-a219-244cfaea3084\/code.power",
+        "settings": "src\/0d9442ab-54d9-4947-a219-244cfaea3084\/settings.json",
+        "path": "src\/0d9442ab-54d9-4947-a219-244cfaea3084",
+        "spk": "Super__0d9442ab_54d9_4947_a219_244cfaea3084__Power",
+        "guid": "0d9442ab-54d9-4947-a219-244cfaea3084"
+    },
+    "117d8c9e-3f8d-40ae-b375-1efa2fe5538a": {
+        "name": "SearchTypeInterface",
+        "type": "interface",
+        "namespace": "VDM\\Joomla\\Componentbuilder\\Search\\Interfaces",
+        "code": "src\/117d8c9e-3f8d-40ae-b375-1efa2fe5538a\/code.php",
+        "power": "src\/117d8c9e-3f8d-40ae-b375-1efa2fe5538a\/code.power",
+        "settings": "src\/117d8c9e-3f8d-40ae-b375-1efa2fe5538a\/settings.json",
+        "path": "src\/117d8c9e-3f8d-40ae-b375-1efa2fe5538a",
+        "spk": "Super__117d8c9e_3f8d_40ae_b375_1efa2fe5538a__Power",
+        "guid": "117d8c9e-3f8d-40ae-b375-1efa2fe5538a"
+    },
+    "15d9e1a9-3364-4d69-9d9f-9b87db820e5c": {
+        "name": "Find",
+        "type": "class",
+        "namespace": "VDM\\Joomla\\Componentbuilder\\Search\\Agent",
+        "code": "src\/15d9e1a9-3364-4d69-9d9f-9b87db820e5c\/code.php",
+        "power": "src\/15d9e1a9-3364-4d69-9d9f-9b87db820e5c\/code.power",
+        "settings": "src\/15d9e1a9-3364-4d69-9d9f-9b87db820e5c\/settings.json",
+        "path": "src\/15d9e1a9-3364-4d69-9d9f-9b87db820e5c",
+        "spk": "Super__15d9e1a9_3364_4d69_9d9f_9b87db820e5c__Power",
+        "guid": "15d9e1a9-3364-4d69-9d9f-9b87db820e5c"
     },
     "2bd1a32c-3d90-4646-9314-28d44d164f76": {
         "name": "LoadInterface",
@@ -120,6 +87,17 @@
         "spk": "Super__2dabfb4a_64cd_4c04_9772_4a75f9f3b710__Power",
         "guid": "2dabfb4a-64cd-4c04-9772-4a75f9f3b710"
     },
+    "3ac29912-0681-4ca9-8197-d5a8f6a49ac7": {
+        "name": "Update",
+        "type": "class",
+        "namespace": "VDM\\Joomla\\Componentbuilder\\Search\\Agent",
+        "code": "src\/3ac29912-0681-4ca9-8197-d5a8f6a49ac7\/code.php",
+        "power": "src\/3ac29912-0681-4ca9-8197-d5a8f6a49ac7\/code.power",
+        "settings": "src\/3ac29912-0681-4ca9-8197-d5a8f6a49ac7\/settings.json",
+        "path": "src\/3ac29912-0681-4ca9-8197-d5a8f6a49ac7",
+        "spk": "Super__3ac29912_0681_4ca9_8197_d5a8f6a49ac7__Power",
+        "guid": "3ac29912-0681-4ca9-8197-d5a8f6a49ac7"
+    },
     "4c44e5d3-750c-4609-88c8-aa441838b8fe": {
         "name": "InsertInterface",
         "type": "interface",
@@ -131,28 +109,6 @@
         "spk": "Super__4c44e5d3_750c_4609_88c8_aa441838b8fe__Power",
         "guid": "4c44e5d3-750c-4609-88c8-aa441838b8fe"
     },
-    "6caf9473-133c-49a9-afa0-9f84151b5155": {
-        "name": "Insert",
-        "type": "class",
-        "namespace": "VDM\\Joomla\\Componentbuilder\\Search\\Database",
-        "code": "src\/6caf9473-133c-49a9-afa0-9f84151b5155\/code.php",
-        "power": "src\/6caf9473-133c-49a9-afa0-9f84151b5155\/code.power",
-        "settings": "src\/6caf9473-133c-49a9-afa0-9f84151b5155\/settings.json",
-        "path": "src\/6caf9473-133c-49a9-afa0-9f84151b5155",
-        "spk": "Super__6caf9473_133c_49a9_afa0_9f84151b5155__Power",
-        "guid": "6caf9473-133c-49a9-afa0-9f84151b5155"
-    },
-    "d5de47ce-9a9e-4e76-a5c6-61ed74842ea3": {
-        "name": "Database",
-        "type": "class",
-        "namespace": "VDM\\Joomla\\Componentbuilder\\Search\\Service",
-        "code": "src\/d5de47ce-9a9e-4e76-a5c6-61ed74842ea3\/code.php",
-        "power": "src\/d5de47ce-9a9e-4e76-a5c6-61ed74842ea3\/code.power",
-        "settings": "src\/d5de47ce-9a9e-4e76-a5c6-61ed74842ea3\/settings.json",
-        "path": "src\/d5de47ce-9a9e-4e76-a5c6-61ed74842ea3",
-        "spk": "Super__d5de47ce_9a9e_4e76_a5c6_61ed74842ea3__Power",
-        "guid": "d5de47ce-9a9e-4e76-a5c6-61ed74842ea3"
-    },
     "55280ec7-e48d-431b-af25-10308dd30636": {
         "name": "FindInterface",
         "type": "interface",
@@ -164,60 +120,60 @@
         "spk": "Super__55280ec7_e48d_431b_af25_10308dd30636__Power",
         "guid": "55280ec7-e48d-431b-af25-10308dd30636"
     },
-    "0d9442ab-54d9-4947-a219-244cfaea3084": {
-        "name": "SearchInterface",
-        "type": "interface",
-        "namespace": "VDM\\Joomla\\Componentbuilder\\Search\\Interfaces",
-        "code": "src\/0d9442ab-54d9-4947-a219-244cfaea3084\/code.php",
-        "power": "src\/0d9442ab-54d9-4947-a219-244cfaea3084\/code.power",
-        "settings": "src\/0d9442ab-54d9-4947-a219-244cfaea3084\/settings.json",
-        "path": "src\/0d9442ab-54d9-4947-a219-244cfaea3084",
-        "spk": "Super__0d9442ab_54d9_4947_a219_244cfaea3084__Power",
-        "guid": "0d9442ab-54d9-4947-a219-244cfaea3084"
-    },
-    "e544a248-4b6a-46cb-9926-a3ac9937807c": {
-        "name": "Search",
+    "6caf9473-133c-49a9-afa0-9f84151b5155": {
+        "name": "Insert",
         "type": "class",
-        "namespace": "VDM\\Joomla\\Componentbuilder\\Search\\Agent",
-        "code": "src\/e544a248-4b6a-46cb-9926-a3ac9937807c\/code.php",
-        "power": "src\/e544a248-4b6a-46cb-9926-a3ac9937807c\/code.power",
-        "settings": "src\/e544a248-4b6a-46cb-9926-a3ac9937807c\/settings.json",
-        "path": "src\/e544a248-4b6a-46cb-9926-a3ac9937807c",
-        "spk": "Super__e544a248_4b6a_46cb_9926_a3ac9937807c__Power",
-        "guid": "e544a248-4b6a-46cb-9926-a3ac9937807c"
+        "namespace": "VDM\\Joomla\\Componentbuilder\\Search\\Database",
+        "code": "src\/6caf9473-133c-49a9-afa0-9f84151b5155\/code.php",
+        "power": "src\/6caf9473-133c-49a9-afa0-9f84151b5155\/code.power",
+        "settings": "src\/6caf9473-133c-49a9-afa0-9f84151b5155\/settings.json",
+        "path": "src\/6caf9473-133c-49a9-afa0-9f84151b5155",
+        "spk": "Super__6caf9473_133c_49a9_afa0_9f84151b5155__Power",
+        "guid": "6caf9473-133c-49a9-afa0-9f84151b5155"
     },
-    "15d9e1a9-3364-4d69-9d9f-9b87db820e5c": {
-        "name": "Find",
+    "6e2ca779-f70e-4871-a138-0ee5eaec6a97": {
+        "name": "Config",
         "type": "class",
-        "namespace": "VDM\\Joomla\\Componentbuilder\\Search\\Agent",
-        "code": "src\/15d9e1a9-3364-4d69-9d9f-9b87db820e5c\/code.php",
-        "power": "src\/15d9e1a9-3364-4d69-9d9f-9b87db820e5c\/code.power",
-        "settings": "src\/15d9e1a9-3364-4d69-9d9f-9b87db820e5c\/settings.json",
-        "path": "src\/15d9e1a9-3364-4d69-9d9f-9b87db820e5c",
-        "spk": "Super__15d9e1a9_3364_4d69_9d9f_9b87db820e5c__Power",
-        "guid": "15d9e1a9-3364-4d69-9d9f-9b87db820e5c"
+        "namespace": "VDM\\Joomla\\Componentbuilder\\Search",
+        "code": "src\/6e2ca779-f70e-4871-a138-0ee5eaec6a97\/code.php",
+        "power": "src\/6e2ca779-f70e-4871-a138-0ee5eaec6a97\/code.power",
+        "settings": "src\/6e2ca779-f70e-4871-a138-0ee5eaec6a97\/settings.json",
+        "path": "src\/6e2ca779-f70e-4871-a138-0ee5eaec6a97",
+        "spk": "Super__6e2ca779_f70e_4871_a138_0ee5eaec6a97__Power",
+        "guid": "6e2ca779-f70e-4871-a138-0ee5eaec6a97"
     },
-    "afdae35d-fe7f-4055-99ea-afd8ff8349b6": {
-        "name": "ReplaceInterface",
-        "type": "interface",
-        "namespace": "VDM\\Joomla\\Componentbuilder\\Search\\Interfaces",
-        "code": "src\/afdae35d-fe7f-4055-99ea-afd8ff8349b6\/code.php",
-        "power": "src\/afdae35d-fe7f-4055-99ea-afd8ff8349b6\/code.power",
-        "settings": "src\/afdae35d-fe7f-4055-99ea-afd8ff8349b6\/settings.json",
-        "path": "src\/afdae35d-fe7f-4055-99ea-afd8ff8349b6",
-        "spk": "Super__afdae35d_fe7f_4055_99ea_afd8ff8349b6__Power",
-        "guid": "afdae35d-fe7f-4055-99ea-afd8ff8349b6"
-    },
-    "3ac29912-0681-4ca9-8197-d5a8f6a49ac7": {
-        "name": "Update",
+    "7f40cc7d-9ab8-4601-8a2b-4eb3d712a40a": {
+        "name": "Model",
         "type": "class",
-        "namespace": "VDM\\Joomla\\Componentbuilder\\Search\\Agent",
-        "code": "src\/3ac29912-0681-4ca9-8197-d5a8f6a49ac7\/code.php",
-        "power": "src\/3ac29912-0681-4ca9-8197-d5a8f6a49ac7\/code.power",
-        "settings": "src\/3ac29912-0681-4ca9-8197-d5a8f6a49ac7\/settings.json",
-        "path": "src\/3ac29912-0681-4ca9-8197-d5a8f6a49ac7",
-        "spk": "Super__3ac29912_0681_4ca9_8197_d5a8f6a49ac7__Power",
-        "guid": "3ac29912-0681-4ca9-8197-d5a8f6a49ac7"
+        "namespace": "VDM\\Joomla\\Componentbuilder\\Search\\Service",
+        "code": "src\/7f40cc7d-9ab8-4601-8a2b-4eb3d712a40a\/code.php",
+        "power": "src\/7f40cc7d-9ab8-4601-8a2b-4eb3d712a40a\/code.power",
+        "settings": "src\/7f40cc7d-9ab8-4601-8a2b-4eb3d712a40a\/settings.json",
+        "path": "src\/7f40cc7d-9ab8-4601-8a2b-4eb3d712a40a",
+        "spk": "Super__7f40cc7d_9ab8_4601_8a2b_4eb3d712a40a__Power",
+        "guid": "7f40cc7d-9ab8-4601-8a2b-4eb3d712a40a"
+    },
+    "83efa9a0-4aec-41f8-9c05-b1ac9617746e": {
+        "name": "Regex",
+        "type": "class",
+        "namespace": "VDM\\Joomla\\Componentbuilder\\Search\\Engine",
+        "code": "src\/83efa9a0-4aec-41f8-9c05-b1ac9617746e\/code.php",
+        "power": "src\/83efa9a0-4aec-41f8-9c05-b1ac9617746e\/code.power",
+        "settings": "src\/83efa9a0-4aec-41f8-9c05-b1ac9617746e\/settings.json",
+        "path": "src\/83efa9a0-4aec-41f8-9c05-b1ac9617746e",
+        "spk": "Super__83efa9a0_4aec_41f8_9c05_b1ac9617746e__Power",
+        "guid": "83efa9a0-4aec-41f8-9c05-b1ac9617746e"
+    },
+    "8f9449fc-bfbc-49a5-b146-d58c8c17dfdf": {
+        "name": "Engine",
+        "type": "abstract class",
+        "namespace": "VDM\\Joomla\\Componentbuilder\\Search\\Abstraction",
+        "code": "src\/8f9449fc-bfbc-49a5-b146-d58c8c17dfdf\/code.php",
+        "power": "src\/8f9449fc-bfbc-49a5-b146-d58c8c17dfdf\/code.power",
+        "settings": "src\/8f9449fc-bfbc-49a5-b146-d58c8c17dfdf\/settings.json",
+        "path": "src\/8f9449fc-bfbc-49a5-b146-d58c8c17dfdf",
+        "spk": "Super__8f9449fc_bfbc_49a5_b146_d58c8c17dfdf__Power",
+        "guid": "8f9449fc-bfbc-49a5-b146-d58c8c17dfdf"
     },
     "abc37ddd-1ff5-4204-9e5b-015ab4f3d4c7": {
         "name": "Replace",
@@ -230,16 +186,16 @@
         "spk": "Super__abc37ddd_1ff5_4204_9e5b_015ab4f3d4c7__Power",
         "guid": "abc37ddd-1ff5-4204-9e5b-015ab4f3d4c7"
     },
-    "0b658434-3767-401e-addc-eabfd1d0e94a": {
-        "name": "Agent",
-        "type": "class",
-        "namespace": "VDM\\Joomla\\Componentbuilder\\Search",
-        "code": "src\/0b658434-3767-401e-addc-eabfd1d0e94a\/code.php",
-        "power": "src\/0b658434-3767-401e-addc-eabfd1d0e94a\/code.power",
-        "settings": "src\/0b658434-3767-401e-addc-eabfd1d0e94a\/settings.json",
-        "path": "src\/0b658434-3767-401e-addc-eabfd1d0e94a",
-        "spk": "Super__0b658434_3767_401e_addc_eabfd1d0e94a__Power",
-        "guid": "0b658434-3767-401e-addc-eabfd1d0e94a"
+    "afdae35d-fe7f-4055-99ea-afd8ff8349b6": {
+        "name": "ReplaceInterface",
+        "type": "interface",
+        "namespace": "VDM\\Joomla\\Componentbuilder\\Search\\Interfaces",
+        "code": "src\/afdae35d-fe7f-4055-99ea-afd8ff8349b6\/code.php",
+        "power": "src\/afdae35d-fe7f-4055-99ea-afd8ff8349b6\/code.power",
+        "settings": "src\/afdae35d-fe7f-4055-99ea-afd8ff8349b6\/settings.json",
+        "path": "src\/afdae35d-fe7f-4055-99ea-afd8ff8349b6",
+        "spk": "Super__afdae35d_fe7f_4055_99ea_afd8ff8349b6__Power",
+        "guid": "afdae35d-fe7f-4055-99ea-afd8ff8349b6"
     },
     "cc6972a7-1574-4ae0-92a8-7f1012aac6f7": {
         "name": "Agent",
@@ -252,15 +208,59 @@
         "spk": "Super__cc6972a7_1574_4ae0_92a8_7f1012aac6f7__Power",
         "guid": "cc6972a7-1574-4ae0-92a8-7f1012aac6f7"
     },
-    "01a89ba8-f8bb-435c-93de-0a8f3fa9432a": {
-        "name": "Factory",
-        "type": "abstract class",
-        "namespace": "VDM\\Joomla\\Componentbuilder\\Search",
-        "code": "src\/01a89ba8-f8bb-435c-93de-0a8f3fa9432a\/code.php",
-        "power": "src\/01a89ba8-f8bb-435c-93de-0a8f3fa9432a\/code.power",
-        "settings": "src\/01a89ba8-f8bb-435c-93de-0a8f3fa9432a\/settings.json",
-        "path": "src\/01a89ba8-f8bb-435c-93de-0a8f3fa9432a",
-        "spk": "Super__01a89ba8_f8bb_435c_93de_0a8f3fa9432a__Power",
-        "guid": "01a89ba8-f8bb-435c-93de-0a8f3fa9432a"
+    "d5de47ce-9a9e-4e76-a5c6-61ed74842ea3": {
+        "name": "Database",
+        "type": "class",
+        "namespace": "VDM\\Joomla\\Componentbuilder\\Search\\Service",
+        "code": "src\/d5de47ce-9a9e-4e76-a5c6-61ed74842ea3\/code.php",
+        "power": "src\/d5de47ce-9a9e-4e76-a5c6-61ed74842ea3\/code.power",
+        "settings": "src\/d5de47ce-9a9e-4e76-a5c6-61ed74842ea3\/settings.json",
+        "path": "src\/d5de47ce-9a9e-4e76-a5c6-61ed74842ea3",
+        "spk": "Super__d5de47ce_9a9e_4e76_a5c6_61ed74842ea3__Power",
+        "guid": "d5de47ce-9a9e-4e76-a5c6-61ed74842ea3"
+    },
+    "da714ea5-96bb-4eb1-959b-39b457be9cd1": {
+        "name": "Search",
+        "type": "class",
+        "namespace": "VDM\\Joomla\\Componentbuilder\\Search\\Service",
+        "code": "src\/da714ea5-96bb-4eb1-959b-39b457be9cd1\/code.php",
+        "power": "src\/da714ea5-96bb-4eb1-959b-39b457be9cd1\/code.power",
+        "settings": "src\/da714ea5-96bb-4eb1-959b-39b457be9cd1\/settings.json",
+        "path": "src\/da714ea5-96bb-4eb1-959b-39b457be9cd1",
+        "spk": "Super__da714ea5_96bb_4eb1_959b_39b457be9cd1__Power",
+        "guid": "da714ea5-96bb-4eb1-959b-39b457be9cd1"
+    },
+    "db093eca-63b3-4d6c-9232-3ceb058121c0": {
+        "name": "Basic",
+        "type": "class",
+        "namespace": "VDM\\Joomla\\Componentbuilder\\Search\\Engine",
+        "code": "src\/db093eca-63b3-4d6c-9232-3ceb058121c0\/code.php",
+        "power": "src\/db093eca-63b3-4d6c-9232-3ceb058121c0\/code.power",
+        "settings": "src\/db093eca-63b3-4d6c-9232-3ceb058121c0\/settings.json",
+        "path": "src\/db093eca-63b3-4d6c-9232-3ceb058121c0",
+        "spk": "Super__db093eca_63b3_4d6c_9232_3ceb058121c0__Power",
+        "guid": "db093eca-63b3-4d6c-9232-3ceb058121c0"
+    },
+    "e544a248-4b6a-46cb-9926-a3ac9937807c": {
+        "name": "Search",
+        "type": "class",
+        "namespace": "VDM\\Joomla\\Componentbuilder\\Search\\Agent",
+        "code": "src\/e544a248-4b6a-46cb-9926-a3ac9937807c\/code.php",
+        "power": "src\/e544a248-4b6a-46cb-9926-a3ac9937807c\/code.power",
+        "settings": "src\/e544a248-4b6a-46cb-9926-a3ac9937807c\/settings.json",
+        "path": "src\/e544a248-4b6a-46cb-9926-a3ac9937807c",
+        "spk": "Super__e544a248_4b6a_46cb_9926_a3ac9937807c__Power",
+        "guid": "e544a248-4b6a-46cb-9926-a3ac9937807c"
+    },
+    "f523ab49-907a-4356-b064-51c85a187fbd": {
+        "name": "Load",
+        "type": "class",
+        "namespace": "VDM\\Joomla\\Componentbuilder\\Search\\Model",
+        "code": "src\/f523ab49-907a-4356-b064-51c85a187fbd\/code.php",
+        "power": "src\/f523ab49-907a-4356-b064-51c85a187fbd\/code.power",
+        "settings": "src\/f523ab49-907a-4356-b064-51c85a187fbd\/settings.json",
+        "path": "src\/f523ab49-907a-4356-b064-51c85a187fbd",
+        "spk": "Super__f523ab49_907a_4356_b064_51c85a187fbd__Power",
+        "guid": "f523ab49-907a-4356-b064-51c85a187fbd"
     }
 }
\ No newline at end of file