diff --git a/composer.json b/composer.json
index 277eef488..cfe5a5d6a 100644
--- a/composer.json
+++ b/composer.json
@@ -36,7 +36,7 @@
     "fusio/adapter-util": "^6.0",
     "fusio/adapter-worker": "^0.2",
     "fusio/marketplace": "^0.2",
-    "firebase/php-jwt": "^6.0",
+    "firebase/php-jwt": "^7.0",
     "symfony/filesystem": "^6.0|^7.0",
     "symfony/mailer": "^6.0|^7.0",
     "symfony/doctrine-messenger": "^6.0|^7.0",
diff --git a/src/Backend/Action/Connection/Agent/Reset.php b/src/Backend/Action/Agent/Create.php
similarity index 61%
rename from src/Backend/Action/Connection/Agent/Reset.php
rename to src/Backend/Action/Agent/Create.php
index 06748b3e1..1cb98c7ab 100644
--- a/src/Backend/Action/Connection/Agent/Reset.php
+++ b/src/Backend/Action/Agent/Create.php
@@ -18,45 +18,45 @@
  * limitations under the License.
  */
 
-namespace Fusio\Impl\Backend\Action\Connection\Agent;
+namespace Fusio\Impl\Backend\Action\Agent;
 
-use Fusio\Engine\Connector;
+use Fusio\Engine\ActionInterface;
 use Fusio\Engine\ContextInterface;
 use Fusio\Engine\ParametersInterface;
 use Fusio\Engine\RequestInterface;
-use Fusio\Impl\Service\System\FrameworkConfig;
-use Fusio\Impl\Table;
+use Fusio\Impl\Service\Agent;
+use Fusio\Impl\Service\System\ContextFactory;
+use Fusio\Model\Backend\AgentCreate;
 use PSX\Http\Environment\HttpResponse;
-use PSX\Http\Exception\BadRequestException;
 
 /**
- * Reset
+ * Create
  *
  * @author  Christoph Kappestein <christoph.kappestein@gmail.com>
  * @license http://www.apache.org/licenses/LICENSE-2.0
  * @link    https://www.fusio-project.org
  */
-readonly class Reset extends AgentAbstract
+readonly class Create implements ActionInterface
 {
-    public function __construct(private Table\Agent $agentTable, Connector $connector, FrameworkConfig $frameworkConfig)
+    public function __construct(private Agent $agentService, private ContextFactory $contextFactory)
     {
-        parent::__construct($connector, $frameworkConfig);
     }
 
     public function handle(RequestInterface $request, ParametersInterface $configuration, ContextInterface $context): mixed
     {
-        $this->assertConnectionEnabled();
+        $body = $request->getPayload();
 
-        $connectionId = (int) $request->get('connection_id');
-        if (empty($connectionId)) {
-            throw new BadRequestException('Provided no connection');
-        }
+        assert($body instanceof AgentCreate);
 
-        $this->agentTable->reset($context->getUser()->getId(), $connectionId);
+        $id = $this->agentService->create(
+            $body,
+            $this->contextFactory->newActionContext($context)
+        );
 
-        return new HttpResponse(200, [], [
+        return new HttpResponse(201, [], [
             'success' => true,
-            'message' => 'Chat successfully reset',
+            'message' => 'Agent successfully created',
+            'id' => '' . $id,
         ]);
     }
 }
diff --git a/src/Backend/Action/Agent/Delete.php b/src/Backend/Action/Agent/Delete.php
new file mode 100644
index 000000000..e1f59e7a1
--- /dev/null
+++ b/src/Backend/Action/Agent/Delete.php
@@ -0,0 +1,56 @@
+<?php
+/*
+ * Fusio - Self-Hosted API Management for Builders.
+ * For the current version and information visit <https://www.fusio-project.org/>
+ *
+ * Copyright (c) Christoph Kappestein <christoph.kappestein@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Fusio\Impl\Backend\Action\Agent;
+
+use Fusio\Engine\ActionInterface;
+use Fusio\Engine\ContextInterface;
+use Fusio\Engine\ParametersInterface;
+use Fusio\Engine\RequestInterface;
+use Fusio\Impl\Service\Agent;
+use Fusio\Impl\Service\System\ContextFactory;
+
+/**
+ * Delete
+ *
+ * @author  Christoph Kappestein <christoph.kappestein@gmail.com>
+ * @license http://www.apache.org/licenses/LICENSE-2.0
+ * @link    https://www.fusio-project.org
+ */
+readonly class Delete implements ActionInterface
+{
+    public function __construct(private Agent $agentService, private ContextFactory $contextFactory)
+    {
+    }
+
+    public function handle(RequestInterface $request, ParametersInterface $configuration, ContextInterface $context): mixed
+    {
+        $id = $this->agentService->delete(
+            $request->get('agent_id'),
+            $this->contextFactory->newActionContext($context)
+        );
+
+        return [
+            'success' => true,
+            'message' => 'Agent successfully deleted',
+            'id' => '' . $id,
+        ];
+    }
+}
diff --git a/src/Backend/Action/Connection/Agent/Get.php b/src/Backend/Action/Agent/Get.php
similarity index 59%
rename from src/Backend/Action/Connection/Agent/Get.php
rename to src/Backend/Action/Agent/Get.php
index 2b56e61cd..1bef00aa5 100644
--- a/src/Backend/Action/Connection/Agent/Get.php
+++ b/src/Backend/Action/Agent/Get.php
@@ -18,17 +18,15 @@
  * limitations under the License.
  */
 
-namespace Fusio\Impl\Backend\Action\Connection\Agent;
+namespace Fusio\Impl\Backend\Action\Agent;
 
-use Fusio\Engine\Connector;
+use Fusio\Engine\ActionInterface;
 use Fusio\Engine\ContextInterface;
 use Fusio\Engine\ParametersInterface;
 use Fusio\Engine\RequestInterface;
 use Fusio\Impl\Backend\View;
-use Fusio\Impl\Service\Agent\Intent;
-use Fusio\Impl\Service\System\FrameworkConfig;
-use PSX\Http\Environment\HttpResponse;
-use PSX\Http\Exception\BadRequestException;
+use Fusio\Impl\Table;
+use PSX\Http\Exception as StatusCode;
 
 /**
  * Get
@@ -37,24 +35,27 @@
  * @license http://www.apache.org/licenses/LICENSE-2.0
  * @link    https://www.fusio-project.org
  */
-readonly class Get extends AgentAbstract
+readonly class Get implements ActionInterface
 {
-    public function __construct(private View\Connection\Agent $view, Connector $connector, FrameworkConfig $frameworkConfig)
+    public function __construct(private View\Agent $view)
     {
-        parent::__construct($connector, $frameworkConfig);
     }
 
     public function handle(RequestInterface $request, ParametersInterface $configuration, ContextInterface $context): mixed
     {
-        $this->assertConnectionEnabled();
+        $agent = $this->view->getEntity(
+            $request->get('agent_id'),
+            $context
+        );
 
-        $connectionId = (int) $request->get('connection_id');
-        if (empty($connectionId)) {
-            throw new BadRequestException('Provided no connection');
+        if (empty($agent)) {
+            throw new StatusCode\NotFoundException('Could not find agent');
         }
 
-        $intent = Intent::tryFrom($request->get('intent') ?? '');
+        if ($agent['status'] == Table\Agent::STATUS_DELETED) {
+            throw new StatusCode\GoneException('Agent was deleted');
+        }
 
-        return new HttpResponse(200, [], $this->view->getCollection($connectionId, $intent, $context));
+        return $agent;
     }
 }
diff --git a/src/Service/Agent/IntentFactory.php b/src/Backend/Action/Agent/GetAll.php
similarity index 60%
rename from src/Service/Agent/IntentFactory.php
rename to src/Backend/Action/Agent/GetAll.php
index cb5329c0d..18c0f31a6 100644
--- a/src/Service/Agent/IntentFactory.php
+++ b/src/Backend/Action/Agent/GetAll.php
@@ -18,32 +18,33 @@
  * limitations under the License.
  */
 
-namespace Fusio\Impl\Service\Agent;
+namespace Fusio\Impl\Backend\Action\Agent;
+
+use Fusio\Engine\ActionInterface;
+use Fusio\Engine\ContextInterface;
+use Fusio\Engine\ParametersInterface;
+use Fusio\Engine\RequestInterface;
+use Fusio\Impl\Backend\Filter\QueryFilter;
+use Fusio\Impl\Backend\View;
 
 /**
- * IntentFactory
+ * GetAll
  *
  * @author  Christoph Kappestein <christoph.kappestein@gmail.com>
  * @license http://www.apache.org/licenses/LICENSE-2.0
  * @link    https://www.fusio-project.org
  */
-readonly class IntentFactory
+class GetAll implements ActionInterface
 {
-    public function __construct(
-        private Intent\ActionIntent $actionIntent,
-        private Intent\SchemaIntent $schemaIntent,
-        private Intent\ArchitectIntent $architectIntent,
-        private Intent\GeneralIntent $generalIntent
-    ) {
+    public function __construct(private View\Agent $view)
+    {
     }
 
-    public function factory(?Intent $intent): IntentInterface
+    public function handle(RequestInterface $request, ParametersInterface $configuration, ContextInterface $context): mixed
     {
-        return match($intent) {
-            Intent::ACTION => $this->actionIntent,
-            Intent::SCHEMA => $this->schemaIntent,
-            Intent::ARCHITECT => $this->architectIntent,
-            default => $this->generalIntent,
-        };
+        return $this->view->getCollection(
+            QueryFilter::from($request),
+            $context
+        );
     }
 }
diff --git a/src/Backend/Action/Agent/GetTools.php b/src/Backend/Action/Agent/GetTools.php
new file mode 100644
index 000000000..f60a581e0
--- /dev/null
+++ b/src/Backend/Action/Agent/GetTools.php
@@ -0,0 +1,63 @@
+<?php
+/*
+ * Fusio - Self-Hosted API Management for Builders.
+ * For the current version and information visit <https://www.fusio-project.org/>
+ *
+ * Copyright (c) Christoph Kappestein <christoph.kappestein@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Fusio\Impl\Backend\Action\Agent;
+
+use Fusio\Engine\ActionInterface;
+use Fusio\Engine\Agent\ToolsInterface;
+use Fusio\Engine\ContextInterface;
+use Fusio\Engine\ParametersInterface;
+use Fusio\Engine\RequestInterface;
+
+/**
+ * GetTools
+ *
+ * @author  Christoph Kappestein <christoph.kappestein@gmail.com>
+ * @license http://www.apache.org/licenses/LICENSE-2.0
+ * @link    https://www.fusio-project.org
+ */
+readonly class GetTools implements ActionInterface
+{
+    public function __construct(private ToolsInterface $tools)
+    {
+    }
+
+    public function handle(RequestInterface $request, ParametersInterface $configuration, ContextInterface $context): mixed
+    {
+        return [
+            'tools' => $this->getTools(),
+        ];
+    }
+
+    private function getTools(): array
+    {
+        $toolbox = $this->tools->resolve();
+
+        $result = [];
+        foreach ($toolbox->getTools() as $tool) {
+            $result[] = [
+                'name' => $tool->getName(),
+                'description' => $tool->getDescription(),
+            ];
+        }
+
+        return $result;
+    }
+}
diff --git a/src/Backend/Action/Agent/Message/GetAll.php b/src/Backend/Action/Agent/Message/GetAll.php
new file mode 100644
index 000000000..204449008
--- /dev/null
+++ b/src/Backend/Action/Agent/Message/GetAll.php
@@ -0,0 +1,50 @@
+<?php
+/*
+ * Fusio - Self-Hosted API Management for Builders.
+ * For the current version and information visit <https://www.fusio-project.org/>
+ *
+ * Copyright (c) Christoph Kappestein <christoph.kappestein@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Fusio\Impl\Backend\Action\Agent\Message;
+
+use Fusio\Engine\ActionInterface;
+use Fusio\Engine\ContextInterface;
+use Fusio\Engine\ParametersInterface;
+use Fusio\Engine\RequestInterface;
+use Fusio\Impl\Backend\View;
+
+/**
+ * GetAll
+ *
+ * @author  Christoph Kappestein <christoph.kappestein@gmail.com>
+ * @license http://www.apache.org/licenses/LICENSE-2.0
+ * @link    https://www.fusio-project.org
+ */
+readonly class GetAll implements ActionInterface
+{
+    public function __construct(private View\Agent\Message $view)
+    {
+    }
+
+    public function handle(RequestInterface $request, ParametersInterface $configuration, ContextInterface $context): mixed
+    {
+        return $this->view->getCollection(
+            (int) $request->get('agent_id'),
+            (int) $request->get('parent'),
+            $context
+        );
+    }
+}
diff --git a/src/Backend/Action/Agent/Message/Submit.php b/src/Backend/Action/Agent/Message/Submit.php
new file mode 100644
index 000000000..5e8198c42
--- /dev/null
+++ b/src/Backend/Action/Agent/Message/Submit.php
@@ -0,0 +1,58 @@
+<?php
+/*
+ * Fusio - Self-Hosted API Management for Builders.
+ * For the current version and information visit <https://www.fusio-project.org/>
+ *
+ * Copyright (c) Christoph Kappestein <christoph.kappestein@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Fusio\Impl\Backend\Action\Agent\Message;
+
+use Fusio\Engine\ActionInterface;
+use Fusio\Engine\ContextInterface;
+use Fusio\Engine\ParametersInterface;
+use Fusio\Engine\RequestInterface;
+use Fusio\Impl\Service\Agent;
+use Fusio\Model\Backend\AgentContent;
+use PSX\Http\Environment\HttpResponse;
+
+/**
+ * Submit
+ *
+ * @author  Christoph Kappestein <christoph.kappestein@gmail.com>
+ * @license http://www.apache.org/licenses/LICENSE-2.0
+ * @link    https://www.fusio-project.org
+ */
+readonly class Submit implements ActionInterface
+{
+    public function __construct(private Agent\Sender $sender)
+    {
+    }
+
+    public function handle(RequestInterface $request, ParametersInterface $configuration, ContextInterface $context): mixed
+    {
+        $body = $request->getPayload();
+
+        assert($body instanceof AgentContent);
+
+        $message = $this->sender->send(
+            $request->get('agent_id'),
+            $body,
+            $context,
+        );
+
+        return new HttpResponse(201, [], $message);
+    }
+}
diff --git a/src/Backend/Action/Agent/Update.php b/src/Backend/Action/Agent/Update.php
new file mode 100644
index 000000000..d2f6723ec
--- /dev/null
+++ b/src/Backend/Action/Agent/Update.php
@@ -0,0 +1,62 @@
+<?php
+/*
+ * Fusio - Self-Hosted API Management for Builders.
+ * For the current version and information visit <https://www.fusio-project.org/>
+ *
+ * Copyright (c) Christoph Kappestein <christoph.kappestein@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Fusio\Impl\Backend\Action\Agent;
+
+use Fusio\Engine\ActionInterface;
+use Fusio\Engine\ContextInterface;
+use Fusio\Engine\ParametersInterface;
+use Fusio\Engine\RequestInterface;
+use Fusio\Impl\Service\Agent;
+use Fusio\Impl\Service\System\ContextFactory;
+use Fusio\Model\Backend\AgentUpdate;
+
+/**
+ * Update
+ *
+ * @author  Christoph Kappestein <christoph.kappestein@gmail.com>
+ * @license http://www.apache.org/licenses/LICENSE-2.0
+ * @link    https://www.fusio-project.org
+ */
+readonly class Update implements ActionInterface
+{
+    public function __construct(private Agent $agentService, private ContextFactory $contextFactory)
+    {
+    }
+
+    public function handle(RequestInterface $request, ParametersInterface $configuration, ContextInterface $context): mixed
+    {
+        $body = $request->getPayload();
+
+        assert($body instanceof AgentUpdate);
+
+        $id = $this->agentService->update(
+            $request->get('agent_id'),
+            $body,
+            $this->contextFactory->newActionContext($context)
+        );
+
+        return [
+            'success' => true,
+            'message' => 'Agent successfully updated',
+            'id' => '' . $id,
+        ];
+    }
+}
diff --git a/src/Backend/Action/Connection/Agent/AgentAbstract.php b/src/Backend/Action/Connection/Agent/AgentAbstract.php
index 753fb39f3..bfb5f82e0 100644
--- a/src/Backend/Action/Connection/Agent/AgentAbstract.php
+++ b/src/Backend/Action/Connection/Agent/AgentAbstract.php
@@ -41,8 +41,13 @@ public function __construct(private Connector $connector, private FrameworkConfi
     {
     }
 
-    protected function getConnection(int $connectionId): AgentInterface
+    protected function getConnection(RequestInterface $request): AgentInterface
     {
+        $connectionId = $request->get('connection_id');
+        if (empty($connectionId)) {
+            throw new BadRequestException('Provided no connection');
+        }
+
         $connection = $this->connector->getConnection($connectionId);
         if (!$connection instanceof AgentInterface) {
             throw new BadRequestException('Provided an invalid connection');
diff --git a/src/Backend/Action/Connection/Agent/Send.php b/src/Backend/Action/Connection/Agent/Send.php
index 38058bcf6..e971ddf9a 100644
--- a/src/Backend/Action/Connection/Agent/Send.php
+++ b/src/Backend/Action/Connection/Agent/Send.php
@@ -24,9 +24,10 @@
 use Fusio\Engine\ContextInterface;
 use Fusio\Engine\ParametersInterface;
 use Fusio\Engine\RequestInterface;
-use Fusio\Impl\Service\Agent\Sender;
+use Fusio\Impl\Service\Agent\Serializer\ResultSerializer;
+use Fusio\Impl\Service\Agent\Unserializer\MessageUnserializer;
 use Fusio\Impl\Service\System\FrameworkConfig;
-use Fusio\Model\Backend\AgentRequest;
+use Fusio\Model\Backend\AgentContent;
 use PSX\Http\Environment\HttpResponse;
 use PSX\Http\Exception\BadRequestException;
 
@@ -39,7 +40,7 @@
  */
 readonly class Send extends AgentAbstract
 {
-    public function __construct(private Sender $sender, Connector $connector, FrameworkConfig $frameworkConfig)
+    public function __construct(private MessageUnserializer $messageUnserializer, private ResultSerializer $resultSerializer, Connector $connector, FrameworkConfig $frameworkConfig)
     {
         parent::__construct($connector, $frameworkConfig);
     }
@@ -48,18 +49,21 @@ public function handle(RequestInterface $request, ParametersInterface $configura
     {
         $this->assertConnectionEnabled();
 
-        $connectionId = (int) $request->get('connection_id');
-        if (empty($connectionId)) {
-            throw new BadRequestException('Provided no connection');
-        }
-
-        $agent = $this->getConnection($connectionId);
+        $agent = $this->getConnection($request);
         $payload = $request->getPayload();
 
-        assert($payload instanceof AgentRequest);
+        assert($payload instanceof AgentContent);
+
+        $messages = $this->messageUnserializer->unserialize($payload);
+
+        $options = [
+            'temperature' => 0.4
+        ];
+
+        $result = $agent->call($messages, $options);
 
-        $response = $this->sender->send($agent, $context->getUser()->getId(), $connectionId, $payload);
+        $output = $this->resultSerializer->serialize($result);
 
-        return new HttpResponse(200, [], $response);
+        return new HttpResponse(200, [], $output);
     }
 }
diff --git a/src/Backend/View/Agent.php b/src/Backend/View/Agent.php
new file mode 100644
index 000000000..1cfcee486
--- /dev/null
+++ b/src/Backend/View/Agent.php
@@ -0,0 +1,92 @@
+<?php
+/*
+ * Fusio - Self-Hosted API Management for Builders.
+ * For the current version and information visit <https://www.fusio-project.org/>
+ *
+ * Copyright (c) Christoph Kappestein <christoph.kappestein@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Fusio\Impl\Backend\View;
+
+use Fusio\Engine\ContextInterface;
+use Fusio\Impl\Backend\Filter\QueryFilter;
+use Fusio\Impl\Table;
+use PSX\Nested\Builder;
+use PSX\Sql\OrderBy;
+use PSX\Sql\ViewAbstract;
+
+/**
+ * Agent
+ *
+ * @author  Christoph Kappestein <christoph.kappestein@gmail.com>
+ * @license http://www.apache.org/licenses/LICENSE-2.0
+ * @link    https://www.fusio-project.org
+ */
+class Agent extends ViewAbstract
+{
+    public function getCollection(QueryFilter $filter, ContextInterface $context)
+    {
+        $startIndex = $filter->getStartIndex();
+        $count = $filter->getCount();
+        $sortBy = Table\Generated\AgentColumn::tryFrom($filter->getSortBy(Table\Generated\AgentTable::COLUMN_NAME) ?? '');
+        $sortOrder = $filter->getSortOrder(OrderBy::ASC);
+
+        $condition = $filter->getCondition([QueryFilter::COLUMN_SEARCH => Table\Generated\AgentTable::COLUMN_NAME]);
+        $condition->equals(Table\Generated\AgentTable::COLUMN_TENANT_ID, $context->getTenantId());
+        $condition->in(Table\Generated\AgentTable::COLUMN_STATUS, [Table\Agent::STATUS_ACTIVE]);
+
+        $builder = new Builder($this->connection);
+
+        $definition = [
+            'totalResults' => $this->getTable(Table\Agent::class)->getCount($condition),
+            'startIndex' => $startIndex,
+            'itemsPerPage' => $count,
+            'entry' => $builder->doCollection([$this->getTable(Table\Agent::class), 'findAll'], [$condition, $startIndex, $count, $sortBy, $sortOrder], [
+                'id' => $builder->fieldInteger(Table\Generated\AgentTable::COLUMN_ID),
+                'status' => $builder->fieldInteger(Table\Generated\AgentTable::COLUMN_STATUS),
+                'type' => $builder->fieldInteger(Table\Generated\AgentTable::COLUMN_TYPE),
+                'name' => Table\Generated\AgentTable::COLUMN_NAME,
+                'description' => Table\Generated\AgentTable::COLUMN_DESCRIPTION,
+                'outgoing' => Table\Generated\AgentTable::COLUMN_OUTGOING,
+                'action' => Table\Generated\AgentTable::COLUMN_ACTION,
+                'metadata' => $builder->fieldJson(Table\Generated\AgentTable::COLUMN_METADATA),
+                'insertDate' => $builder->fieldDateTime(Table\Generated\AgentTable::COLUMN_INSERT_DATE),
+            ]),
+        ];
+
+        return $builder->build($definition);
+    }
+
+    public function getEntity(string $id, ContextInterface $context)
+    {
+        $builder = new Builder($this->connection);
+
+        $definition = $builder->doEntity([$this->getTable(Table\Agent::class), 'findOneByIdentifier'], [$context->getTenantId(), $context->getUser()->getCategoryId(), $id], [
+            'id' => $builder->fieldInteger(Table\Generated\AgentTable::COLUMN_ID),
+            'status' => $builder->fieldInteger(Table\Generated\AgentTable::COLUMN_STATUS),
+            'type' => $builder->fieldInteger(Table\Generated\AgentTable::COLUMN_TYPE),
+            'name' => Table\Generated\AgentTable::COLUMN_NAME,
+            'description' => Table\Generated\AgentTable::COLUMN_DESCRIPTION,
+            'introduction' => Table\Generated\AgentTable::COLUMN_INTRODUCTION,
+            'tools' => $builder->fieldJson(Table\Generated\AgentTable::COLUMN_TOOLS),
+            'outgoing' => Table\Generated\AgentTable::COLUMN_OUTGOING,
+            'action' => Table\Generated\AgentTable::COLUMN_ACTION,
+            'metadata' => $builder->fieldJson(Table\Generated\AgentTable::COLUMN_METADATA),
+            'insertDate' => $builder->fieldDateTime(Table\Generated\AgentTable::COLUMN_INSERT_DATE),
+        ]);
+
+        return $builder->build($definition);
+    }
+}
diff --git a/src/Backend/View/Connection/Agent.php b/src/Backend/View/Agent/Message.php
similarity index 55%
rename from src/Backend/View/Connection/Agent.php
rename to src/Backend/View/Agent/Message.php
index d57e4330a..94744f96d 100644
--- a/src/Backend/View/Connection/Agent.php
+++ b/src/Backend/View/Agent/Message.php
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-namespace Fusio\Impl\Backend\View\Connection;
+namespace Fusio\Impl\Backend\View\Agent;
 
 use Fusio\Engine\ContextInterface;
 use Fusio\Impl\Service;
@@ -35,31 +35,42 @@
  * @license http://www.apache.org/licenses/LICENSE-2.0
  * @link    https://www.fusio-project.org
  */
-class Agent extends ViewAbstract
+class Message extends ViewAbstract
 {
-    public function getCollection(int $connectionId, ?Service\Agent\Intent $intent, ContextInterface $context)
+    public function getCollection(int $agentId, int $parentId, ContextInterface $context)
     {
         $condition = Condition::withAnd();
-        $condition->equals(Table\Generated\AgentColumn::USER_ID, $context->getUser()->getId());
-        $condition->equals(Table\Generated\AgentColumn::CONNECTION_ID, $connectionId);
-        $condition->equals(Table\Generated\AgentColumn::INTENT, $intent?->getInt() ?? 0);
+        $condition->equals(Table\Generated\AgentMessageColumn::AGENT_ID, $agentId);
+        $condition->equals(Table\Generated\AgentMessageColumn::USER_ID, $context->getUser()->getId());
 
-        $count = $this->getTable(Table\Agent::class)->getCount($condition);
+        if ($parentId > 0) {
+            $condition->equals(Table\Generated\AgentMessageColumn::PARENT_ID, $parentId);
+        } else {
+            $condition->nil(Table\Generated\AgentMessageColumn::PARENT_ID);
+        }
+
+        $count = $this->getTable(Table\Agent\Message::class)->getCount($condition);
         $startIndex = max(0, $count - Service\Agent\Sender::CONTEXT_MESSAGES_LENGTH);
-        $sortBy = Table\Generated\AgentColumn::ID;
+        $sortBy = Table\Generated\AgentMessageColumn::ID;
         $sortOrder = OrderBy::ASC;
 
         $builder = new Builder($this->connection);
 
         $definition = [
-            'totalResults' => Service\Agent\Sender::CONTEXT_MESSAGES_LENGTH,
+            'totalResults' => $count,
             'startIndex' => 0,
             'itemsPerPage' => Service\Agent\Sender::CONTEXT_MESSAGES_LENGTH,
-            'entry' => $builder->doCollection([$this->getTable(Table\Agent::class), 'findBy'], [$condition, $startIndex, $count, $sortBy, $sortOrder], [
-                'id' => $builder->fieldInteger(Table\Generated\AgentTable::COLUMN_ID),
-                'origin' => $builder->fieldInteger(Table\Generated\AgentTable::COLUMN_ORIGIN),
-                'message' => $builder->fieldJson(Table\Generated\AgentTable::COLUMN_MESSAGE),
-                'insertDate' => $builder->fieldDateTime(Table\Generated\AgentTable::COLUMN_INSERT_DATE),
+            'entry' => $builder->doCollection([$this->getTable(Table\Agent\Message::class), 'findBy'], [$condition, $startIndex, $count, $sortBy, $sortOrder], [
+                'id' => $builder->fieldInteger(Table\Generated\AgentMessageTable::COLUMN_ID),
+                'role' => $builder->fieldCallback(Table\Generated\AgentMessageTable::COLUMN_ORIGIN, function ($value) {
+                    return match ($value) {
+                        Table\Agent\Message::ORIGIN_ASSISTANT => 'assistant',
+                        Table\Agent\Message::ORIGIN_SYSTEM => 'system',
+                        default => 'user',
+                    };
+                }),
+                'content' => $builder->fieldJson(Table\Generated\AgentMessageTable::COLUMN_CONTENT),
+                'insertDate' => $builder->fieldDateTime(Table\Generated\AgentMessageTable::COLUMN_INSERT_DATE),
             ]),
         ];
 
diff --git a/src/Service/Agent/IntentInterface.php b/src/Event/Agent/CreatedEvent.php
similarity index 64%
rename from src/Service/Agent/IntentInterface.php
rename to src/Event/Agent/CreatedEvent.php
index 031fdadca..c2ac25e4f 100644
--- a/src/Service/Agent/IntentInterface.php
+++ b/src/Event/Agent/CreatedEvent.php
@@ -18,26 +18,33 @@
  * limitations under the License.
  */
 
-namespace Fusio\Impl\Service\Agent;
+namespace Fusio\Impl\Event\Agent;
 
-use Fusio\Model\Backend\AgentMessage;
-use Symfony\AI\Platform\Result\ResultInterface;
+use Fusio\Impl\Authorization\UserContext;
+use Fusio\Impl\Event\EventAbstract;
+use Fusio\Model\Backend\AgentCreate;
+use Fusio\Model\Backend\CronjobCreate;
 
 /**
- * An intent describes the intent of a user what he wants to achieve, depending on the intent we provide different
- * messages, tools and response formats to the agent
+ * CreatedEvent
  *
  * @author  Christoph Kappestein <christoph.kappestein@gmail.com>
  * @license http://www.apache.org/licenses/LICENSE-2.0
  * @link    https://www.fusio-project.org
  */
-interface IntentInterface
+class CreatedEvent extends EventAbstract
 {
-    public function getMessage(): string;
+    private AgentCreate $agent;
 
-    public function getTools(): array;
+    public function __construct(AgentCreate $agent, UserContext $context)
+    {
+        parent::__construct($context);
 
-    public function getResponseSchema(): ?array;
+        $this->agent = $agent;
+    }
 
-    public function transformResult(ResultInterface $result): AgentMessage;
+    public function getAgent(): AgentCreate
+    {
+        return $this->agent;
+    }
 }
diff --git a/src/Event/Agent/DeletedEvent.php b/src/Event/Agent/DeletedEvent.php
new file mode 100644
index 000000000..e8c930e2c
--- /dev/null
+++ b/src/Event/Agent/DeletedEvent.php
@@ -0,0 +1,49 @@
+<?php
+/*
+ * Fusio - Self-Hosted API Management for Builders.
+ * For the current version and information visit <https://www.fusio-project.org/>
+ *
+ * Copyright (c) Christoph Kappestein <christoph.kappestein@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Fusio\Impl\Event\Agent;
+
+use Fusio\Impl\Authorization\UserContext;
+use Fusio\Impl\Event\EventAbstract;
+use Fusio\Impl\Table\Generated\AgentRow;
+
+/**
+ * DeletedEvent
+ *
+ * @author  Christoph Kappestein <christoph.kappestein@gmail.com>
+ * @license http://www.apache.org/licenses/LICENSE-2.0
+ * @link    https://www.fusio-project.org
+ */
+class DeletedEvent extends EventAbstract
+{
+    private AgentRow $existing;
+
+    public function __construct(AgentRow $existing, UserContext $context)
+    {
+        parent::__construct($context);
+
+        $this->existing = $existing;
+    }
+
+    public function getExisting(): AgentRow
+    {
+        return $this->existing;
+    }
+}
diff --git a/src/Event/Agent/UpdatedEvent.php b/src/Event/Agent/UpdatedEvent.php
new file mode 100644
index 000000000..bf1bb53bf
--- /dev/null
+++ b/src/Event/Agent/UpdatedEvent.php
@@ -0,0 +1,57 @@
+<?php
+/*
+ * Fusio - Self-Hosted API Management for Builders.
+ * For the current version and information visit <https://www.fusio-project.org/>
+ *
+ * Copyright (c) Christoph Kappestein <christoph.kappestein@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Fusio\Impl\Event\Agent;
+
+use Fusio\Impl\Authorization\UserContext;
+use Fusio\Impl\Event\EventAbstract;
+use Fusio\Impl\Table\Generated\AgentRow;
+use Fusio\Model\Backend\AgentUpdate;
+
+/**
+ * UpdatedEvent
+ *
+ * @author  Christoph Kappestein <christoph.kappestein@gmail.com>
+ * @license http://www.apache.org/licenses/LICENSE-2.0
+ * @link    https://www.fusio-project.org
+ */
+class UpdatedEvent extends EventAbstract
+{
+    private AgentUpdate $agent;
+    private AgentRow $existing;
+
+    public function __construct(AgentUpdate $agent, AgentRow $existing, UserContext $context)
+    {
+        parent::__construct($context);
+
+        $this->agent = $agent;
+        $this->existing = $existing;
+    }
+
+    public function getAgent(): AgentUpdate
+    {
+        return $this->agent;
+    }
+
+    public function getExisting(): AgentRow
+    {
+        return $this->existing;
+    }
+}
diff --git a/src/Installation/DataBag.php b/src/Installation/DataBag.php
index 0e78a7dba..f36503827 100644
--- a/src/Installation/DataBag.php
+++ b/src/Installation/DataBag.php
@@ -25,6 +25,7 @@
 use Fusio\Impl\Backend;
 use Fusio\Impl\Consumer;
 use Fusio\Impl\Table;
+use PSX\Json\Parser;
 use PSX\Schema\ContentType;
 use PSX\Schema\TypeInterface;
 
@@ -55,6 +56,7 @@ public function __construct()
             'fusio_connection' => [],
             'fusio_cronjob' => [],
             'fusio_event' => [],
+            'fusio_agent' => [],
             'fusio_log' => [],
             'fusio_provider' => [],
             'fusio_page' => [],
@@ -82,6 +84,7 @@ public function __construct()
             'fusio_role_scope' => [],
             'fusio_action_commit' => [],
             'fusio_schema_commit' => [],
+            'fusio_agent_message' => [],
         ];
     }
 
@@ -229,6 +232,37 @@ public function addActionCommit(string $action, string $user, string $commitHash
         ];
     }
 
+    public function addAgent(string $category, string $connection, int $type, string $name, string $description, string $introduction, array $tools, string $outgoing, string $action, int $status = Table\Agent::STATUS_ACTIVE, ?array $metadata = null, ?string $date = null, ?string $tenantId = null): void
+    {
+        $this->data['fusio_agent'][$name] = [
+            'tenant_id' => $tenantId,
+            'category_id' => $this->getReference('fusio_category', $category, $tenantId),
+            'connection_id' => $this->getReference('fusio_connection', $connection, $tenantId),
+            'status' => $status,
+            'type' => $type,
+            'name' => $name,
+            'description' => $description,
+            'introduction' => $introduction,
+            'tools' => Parser::encode($tools),
+            'outgoing' => $outgoing,
+            'action' => $action,
+            'metadata' => $metadata !== null ? json_encode($metadata) : null,
+            'insert_date' => (new \DateTime($date ?? 'now'))->format('Y-m-d H:i:s'),
+        ];
+    }
+
+    public function addAgentMessage(string $agent, string $user, int $origin, string $content, ?int $parentId = null, ?string $date = null, ?string $tenantId = null): void
+    {
+        $this->data['fusio_agent_message'][$content] = [
+            'agent_id' => $this->getReference('fusio_agent', $agent, $tenantId),
+            'user_id' => $this->getReference('fusio_user', $user, $tenantId),
+            'parent_id' => $parentId !== null ? $parentId : null,
+            'origin' => $origin,
+            'content' => Parser::encode(['type' => 'text', 'content' => $content]),
+            'insert_date' => (new \DateTime($date ?? 'now'))->format('Y-m-d H:i:s'),
+        ];
+    }
+
     public function addApp(string $user, string $name, string $url, string $appKey, string $appSecret, int $status = Table\App::STATUS_ACTIVE, ?array $metadata = null, ?string $date = null, ?string $tenantId = null): void
     {
         $this->data['fusio_app'][$name] = [
diff --git a/src/Installation/NewInstallation.php b/src/Installation/NewInstallation.php
index a592aca10..cfbbfeb78 100644
--- a/src/Installation/NewInstallation.php
+++ b/src/Installation/NewInstallation.php
@@ -32,7 +32,6 @@
 use Fusio\Impl\Table;
 use Fusio\Marketplace;
 use Fusio\Model;
-use Psr\Container\ContainerInterface;
 use PSX\Api\Model\Passthru;
 use PSX\Api\OperationInterface;
 use PSX\Schema\ContentType;
@@ -275,6 +274,86 @@ private static function getOperations(): array
                     throws: [999 => Model\Common\Message::class],
                     description: 'Returns a paginated list of action commits',
                 ),
+                'agent.getAll' => new Operation(
+                    action: Backend\Action\Agent\GetAll::class,
+                    httpMethod: 'GET',
+                    httpPath: '/agent',
+                    httpCode: 200,
+                    outgoing: Model\Backend\AgentCollection::class,
+                    parameters: ['startIndex' => PropertyTypeFactory::getInteger(), 'count' => PropertyTypeFactory::getInteger(), 'search' => PropertyTypeFactory::getString()],
+                    throws: [999 => Model\Common\Message::class],
+                    description: 'Returns a paginated list of agents',
+                ),
+                'agent.create' => new Operation(
+                    action: Backend\Action\Agent\Create::class,
+                    httpMethod: 'POST',
+                    httpPath: '/agent',
+                    httpCode: 201,
+                    outgoing: Model\Common\Message::class,
+                    incoming: Model\Backend\AgentCreate::class,
+                    throws: [999 => Model\Common\Message::class],
+                    eventName: 'fusio.agent.create',
+                    description: 'Creates a new agent',
+                ),
+                'agent.get' => new Operation(
+                    action: Backend\Action\Agent\Get::class,
+                    httpMethod: 'GET',
+                    httpPath: '/agent/$agent_id<[0-9]+|^~>',
+                    httpCode: 200,
+                    outgoing: Model\Backend\Agent::class,
+                    throws: [999 => Model\Common\Message::class],
+                    description: 'Returns a specific agent',
+                ),
+                'agent.update' => new Operation(
+                    action: Backend\Action\Agent\Update::class,
+                    httpMethod: 'PUT',
+                    httpPath: '/agent/$agent_id<[0-9]+|^~>',
+                    httpCode: 200,
+                    outgoing: Model\Common\Message::class,
+                    incoming: Model\Backend\AgentUpdate::class,
+                    throws: [999 => Model\Common\Message::class],
+                    eventName: 'fusio.agent.update',
+                    description: 'Updates an existing agent',
+                ),
+                'agent.delete' => new Operation(
+                    action: Backend\Action\Agent\Delete::class,
+                    httpMethod: 'DELETE',
+                    httpPath: '/agent/$agent_id<[0-9]+|^~>',
+                    httpCode: 200,
+                    outgoing: Model\Common\Message::class,
+                    throws: [999 => Model\Common\Message::class],
+                    eventName: 'fusio.agent.delete',
+                    description: 'Deletes an existing agent',
+                ),
+                'agent.getTools' => new Operation(
+                    action: Backend\Action\Agent\GetTools::class,
+                    httpMethod: 'GET',
+                    httpPath: '/agent/tools',
+                    httpCode: 200,
+                    outgoing: Model\Backend\AgentTools::class,
+                    throws: [999 => Model\Common\Message::class],
+                    description: 'Returns available tools for an agent',
+                ),
+                'agent.message.getAll' => new Operation(
+                    action: Backend\Action\Agent\Message\GetAll::class,
+                    httpMethod: 'GET',
+                    httpPath: '/agent/$agent_id<[0-9]+|^~>/message',
+                    httpCode: 200,
+                    outgoing: Model\Backend\AgentMessageCollection::class,
+                    parameters: ['parent' => PropertyTypeFactory::getInteger()],
+                    throws: [999 => Model\Common\Message::class],
+                    description: 'Returns a paginated list of agent messages',
+                ),
+                'agent.message.submit' => new Operation(
+                    action: Backend\Action\Agent\Message\Submit::class,
+                    httpMethod: 'POST',
+                    httpPath: '/agent/$agent_id<[0-9]+|^~>/message',
+                    httpCode: 201,
+                    outgoing: Model\Backend\AgentMessage::class,
+                    incoming: Model\Backend\AgentContent::class,
+                    throws: [999 => Model\Common\Message::class],
+                    description: 'Submits a new agent message',
+                ),
                 'app.getAll' => new Operation(
                     action: Backend\Action\App\GetAll::class,
                     httpMethod: 'GET',
@@ -514,35 +593,16 @@ private static function getOperations(): array
                     throws: [999 => Model\Common\Message::class],
                     description: 'Returns a redirect url to start the OAuth2 authorization flow for the given connection',
                 ),
-                'connection.agent.get' => new Operation(
-                    action: Backend\Action\Connection\Agent\Get::class,
-                    httpMethod: 'GET',
-                    httpPath: '/connection/:connection_id/agent',
-                    httpCode: 200,
-                    outgoing: Model\Backend\AgentCollection::class,
-                    parameters: ['intent' => PropertyTypeFactory::getString()],
-                    throws: [999 => Model\Common\Message::class],
-                    description: 'Returns all previous sent messages',
-                ),
                 'connection.agent.send' => new Operation(
                     action: Backend\Action\Connection\Agent\Send::class,
                     httpMethod: 'POST',
                     httpPath: '/connection/:connection_id/agent',
                     httpCode: 200,
-                    outgoing: Model\Backend\AgentResponse::class,
-                    incoming: Model\Backend\AgentRequest::class,
+                    outgoing: Model\Backend\AgentContent::class,
+                    incoming: Model\Backend\AgentContent::class,
                     throws: [999 => Model\Common\Message::class],
                     description: 'Sends a message to an agent',
                 ),
-                'connection.agent.reset' => new Operation(
-                    action: Backend\Action\Connection\Agent\Reset::class,
-                    httpMethod: 'DELETE',
-                    httpPath: '/connection/:connection_id/agent',
-                    httpCode: 200,
-                    outgoing: Model\Common\Message::class,
-                    throws: [999 => Model\Common\Message::class],
-                    description: 'Resets all agent messages',
-                ),
                 'connection.database.getTables' => new Operation(
                     action: Backend\Action\Connection\Database\Table\GetAll::class,
                     httpMethod: 'GET',
diff --git a/src/Migrations/Version20230508210151.php b/src/Migrations/Version20230508210151.php
index 13f353525..b877b9f02 100644
--- a/src/Migrations/Version20230508210151.php
+++ b/src/Migrations/Version20230508210151.php
@@ -57,13 +57,32 @@ public function up(Schema $schema) : void
             $agentTable = $schema->createTable('fusio_agent');
             $agentTable->addColumn('id', 'integer', ['autoincrement' => true]);
             $agentTable->addColumn('tenant_id', 'string', ['length' => 64, 'notnull' => false, 'default' => null]);
-            $agentTable->addColumn('user_id', 'integer');
+            $agentTable->addColumn('category_id', 'integer', ['default' => 1]);
             $agentTable->addColumn('connection_id', 'integer');
-            $agentTable->addColumn('origin', 'integer');
-            $agentTable->addColumn('intent', 'integer');
-            $agentTable->addColumn('message', 'text');
+            $agentTable->addColumn('status', 'integer', ['default' => Table\Agent::STATUS_ACTIVE]);
+            $agentTable->addColumn('type', 'integer', ['default' => Table\Agent::TYPE_GENERAL]);
+            $agentTable->addColumn('name', 'string');
+            $agentTable->addColumn('description', 'string');
+            $agentTable->addColumn('introduction', 'text');
+            $agentTable->addColumn('tools', 'text', ['notnull' => false, 'default' => null]);
+            $agentTable->addColumn('outgoing', 'string', ['length' => 255, 'notnull' => false, 'default' => null]);
+            $agentTable->addColumn('action', 'string', ['length' => 255, 'notnull' => false, 'default' => null]);
+            $agentTable->addColumn('metadata', 'text', ['notnull' => false]);
             $agentTable->addColumn('insert_date', 'datetime');
             $agentTable->setPrimaryKey(['id']);
+            $agentTable->addUniqueIndex(['tenant_id', 'name']);
+        }
+
+        if (!$schema->hasTable('fusio_agent_message')) {
+            $agentMessageTable = $schema->createTable('fusio_agent_message');
+            $agentMessageTable->addColumn('id', 'integer', ['autoincrement' => true]);
+            $agentMessageTable->addColumn('agent_id', 'integer');
+            $agentMessageTable->addColumn('user_id', 'integer');
+            $agentMessageTable->addColumn('parent_id', 'integer', ['notnull' => false, 'default' => null]);
+            $agentMessageTable->addColumn('origin', 'integer');
+            $agentMessageTable->addColumn('content', 'text');
+            $agentMessageTable->addColumn('insert_date', 'datetime');
+            $agentMessageTable->setPrimaryKey(['id']);
         }
 
         if (!$schema->hasTable('fusio_app')) {
@@ -671,8 +690,14 @@ public function up(Schema $schema) : void
         }
 
         if (isset($agentTable)) {
-            $agentTable->addForeignKeyConstraint($schema->getTable('fusio_user'), ['user_id'], ['id'], [], 'agent_chat_user_id');
-            $agentTable->addForeignKeyConstraint($schema->getTable('fusio_connection'), ['connection_id'], ['id'], [], 'agent_chat_connection_id');
+            $agentTable->addForeignKeyConstraint($schema->getTable('fusio_category'), ['category_id'], ['id'], [], 'agent_category_id');
+            $agentTable->addForeignKeyConstraint($schema->getTable('fusio_connection'), ['connection_id'], ['id'], [], 'agent_connection_id');
+        }
+
+        if (isset($agentMessageTable)) {
+            $agentMessageTable->addForeignKeyConstraint($schema->getTable('fusio_agent'), ['agent_id'], ['id'], [], 'agent_message_agent_id');
+            $agentMessageTable->addForeignKeyConstraint($schema->getTable('fusio_user'), ['user_id'], ['id'], [], 'agent_message_user_id');
+            $agentMessageTable->addForeignKeyConstraint($schema->getTable('fusio_agent_message'), ['parent_id'], ['id'], [], 'agent_message_parent_id');
         }
 
         if (isset($appTable)) {
diff --git a/src/Migrations/Version20260218181413.php b/src/Migrations/Version20260218181413.php
new file mode 100644
index 000000000..bf13bc952
--- /dev/null
+++ b/src/Migrations/Version20260218181413.php
@@ -0,0 +1,88 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Fusio\Impl\Migrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+use Fusio\Impl\Installation\DataSyncronizer;
+use Fusio\Impl\Table;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20260218181413 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $needsCreate = false;
+        if ($schema->hasTable('fusio_agent')) {
+            $agentTable = $schema->getTable('fusio_agent');
+            if (!$agentTable->hasColumn('introduction')) {
+                $schema->dropTable('fusio_agent');
+                $needsCreate = true;
+            }
+        } else {
+            $needsCreate = true;
+        }
+
+        if ($needsCreate) {
+            $agentTable = $schema->createTable('fusio_agent');
+            $agentTable->addColumn('id', 'integer', ['autoincrement' => true]);
+            $agentTable->addColumn('tenant_id', 'string', ['length' => 64, 'notnull' => false, 'default' => null]);
+            $agentTable->addColumn('category_id', 'integer', ['default' => 1]);
+            $agentTable->addColumn('connection_id', 'integer');
+            $agentTable->addColumn('status', 'integer', ['default' => Table\Agent::STATUS_ACTIVE]);
+            $agentTable->addColumn('type', 'integer', ['default' => Table\Agent::TYPE_GENERAL]);
+            $agentTable->addColumn('name', 'string');
+            $agentTable->addColumn('description', 'string');
+            $agentTable->addColumn('introduction', 'text');
+            $agentTable->addColumn('tools', 'text', ['notnull' => false, 'default' => null]);
+            $agentTable->addColumn('outgoing', 'string', ['length' => 255, 'notnull' => false, 'default' => null]);
+            $agentTable->addColumn('action', 'string', ['length' => 255, 'notnull' => false, 'default' => null]);
+            $agentTable->addColumn('metadata', 'text', ['notnull' => false]);
+            $agentTable->addColumn('insert_date', 'datetime');
+            $agentTable->setPrimaryKey(['id']);
+            $agentTable->addUniqueIndex(['tenant_id', 'name']);
+
+            $agentTable->addForeignKeyConstraint($schema->getTable('fusio_category'), ['category_id'], ['id'], [], 'agent_category_id');
+            $agentTable->addForeignKeyConstraint($schema->getTable('fusio_connection'), ['connection_id'], ['id'], [], 'agent_connection_id');
+        }
+
+        if (!$schema->hasTable('fusio_agent_message')) {
+            $agentMessageTable = $schema->createTable('fusio_agent_message');
+            $agentMessageTable->addColumn('id', 'integer', ['autoincrement' => true]);
+            $agentMessageTable->addColumn('agent_id', 'integer');
+            $agentMessageTable->addColumn('user_id', 'integer');
+            $agentMessageTable->addColumn('parent_id', 'integer', ['notnull' => false, 'default' => null]);
+            $agentMessageTable->addColumn('origin', 'integer');
+            $agentMessageTable->addColumn('content', 'text');
+            $agentMessageTable->addColumn('insert_date', 'datetime');
+            $agentMessageTable->setPrimaryKey(['id']);
+
+            $agentMessageTable->addForeignKeyConstraint($schema->getTable('fusio_agent'), ['agent_id'], ['id'], [], 'agent_message_agent_id');
+            $agentMessageTable->addForeignKeyConstraint($schema->getTable('fusio_user'), ['user_id'], ['id'], [], 'agent_message_user_id');
+            $agentMessageTable->addForeignKeyConstraint($schema->getTable('fusio_agent_message'), ['parent_id'], ['id'], [], 'agent_message_parent_id');
+        }
+    }
+
+    public function down(Schema $schema): void
+    {
+    }
+
+    public function isTransactional(): bool
+    {
+        return false;
+    }
+
+    public function postUp(Schema $schema): void
+    {
+        DataSyncronizer::sync($this->connection);
+    }
+}
diff --git a/src/Service/Agent.php b/src/Service/Agent.php
new file mode 100644
index 000000000..a2d0a60d0
--- /dev/null
+++ b/src/Service/Agent.php
@@ -0,0 +1,137 @@
+<?php
+/*
+ * Fusio - Self-Hosted API Management for Builders.
+ * For the current version and information visit <https://www.fusio-project.org/>
+ *
+ * Copyright (c) Christoph Kappestein <christoph.kappestein@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Fusio\Impl\Service;
+
+use Fusio\Impl\Authorization\UserContext;
+use Fusio\Impl\Event\Agent\CreatedEvent;
+use Fusio\Impl\Event\Agent\DeletedEvent;
+use Fusio\Impl\Event\Agent\UpdatedEvent;
+use Fusio\Impl\Table;
+use Fusio\Model\Backend\AgentCreate;
+use Fusio\Model\Backend\AgentUpdate;
+use Psr\EventDispatcher\EventDispatcherInterface;
+use PSX\DateTime\LocalDateTime;
+use PSX\Http\Exception as StatusCode;
+use PSX\Json\Parser;
+
+/**
+ * Agent
+ *
+ * @author  Christoph Kappestein <christoph.kappestein@gmail.com>
+ * @license http://www.apache.org/licenses/LICENSE-2.0
+ * @link    https://www.fusio-project.org
+ */
+readonly class Agent
+{
+    public function __construct(
+        private Table\Agent $agentTable,
+        private Agent\Validator $validator,
+        private EventDispatcherInterface $eventDispatcher
+    ) {
+    }
+
+    public function create(AgentCreate $agent, UserContext $context): int
+    {
+        $this->validator->assert($agent, $context->getCategoryId(), $context->getTenantId());
+
+        // create agent
+        try {
+            $this->agentTable->beginTransaction();
+
+            $row = new Table\Generated\AgentRow();
+            $row->setTenantId($context->getTenantId());
+            $row->setCategoryId($context->getCategoryId());
+            $row->setConnectionId($agent->getConnection());
+            $row->setStatus(Table\Agent::STATUS_ACTIVE);
+            $row->setType($agent->getType() ?? Table\Agent::TYPE_GENERAL);
+            $row->setName($agent->getName());
+            $row->setDescription($agent->getDescription());
+            $row->setIntroduction($agent->getIntroduction());
+            $row->setTools($agent->getTools() !== null ? Parser::encode($agent->getTools()) : null);
+            $row->setOutgoing($agent->getOutgoing());
+            $row->setAction($agent->getAction());
+            $row->setInsertDate(LocalDateTime::now());
+            $row->setMetadata($agent->getMetadata() !== null ? Parser::encode($agent->getMetadata()) : null);
+            $this->agentTable->create($row);
+
+            $agentId = $this->agentTable->getLastInsertId();
+            $agent->setId($agentId);
+
+            $this->agentTable->commit();
+        } catch (\Throwable $e) {
+            $this->agentTable->rollBack();
+
+            throw $e;
+        }
+
+        $this->eventDispatcher->dispatch(new CreatedEvent($agent, $context));
+
+        return $agentId;
+    }
+
+    public function update(string $agentId, AgentUpdate $agent, UserContext $context): int
+    {
+        $existing = $this->agentTable->findOneByIdentifier($context->getTenantId(), $context->getCategoryId(), $agentId);
+        if (empty($existing)) {
+            throw new StatusCode\NotFoundException('Could not find agent');
+        }
+
+        if ($existing->getStatus() == Table\Agent::STATUS_DELETED) {
+            throw new StatusCode\GoneException('Agent was deleted');
+        }
+
+        $this->validator->assert($agent, $context->getCategoryId(), $context->getTenantId(), $existing);
+
+        $existing->setConnectionId($agent->getConnection() ?? $existing->getConnectionId());
+        $existing->setType($agent->getType() ?? $existing->getType());
+        $existing->setName($agent->getName() ?? $existing->getName());
+        $existing->setDescription($agent->getDescription() ?? $existing->getDescription());
+        $existing->setIntroduction($agent->getIntroduction() ?? $existing->getIntroduction());
+        $existing->setTools($agent->getTools() !== null ? Parser::encode($agent->getTools()) : $existing->getTools());
+        $existing->setOutgoing($agent->getOutgoing() ?? $existing->getOutgoing());
+        $existing->setAction($agent->getAction() ?? $existing->getAction());
+        $existing->setMetadata($agent->getMetadata() !== null ? Parser::encode($agent->getMetadata()) : $existing->getMetadata());
+        $this->agentTable->update($existing);
+
+        $this->eventDispatcher->dispatch(new UpdatedEvent($agent, $existing, $context));
+
+        return $existing->getId();
+    }
+
+    public function delete(string $agentId, UserContext $context): int
+    {
+        $existing = $this->agentTable->findOneByIdentifier($context->getTenantId(), $context->getCategoryId(), $agentId);
+        if (empty($existing)) {
+            throw new StatusCode\NotFoundException('Could not find agent');
+        }
+
+        if ($existing->getStatus() == Table\Agent::STATUS_DELETED) {
+            throw new StatusCode\GoneException('Agent was deleted');
+        }
+
+        $existing->setStatus(Table\Agent::STATUS_DELETED);
+        $this->agentTable->update($existing);
+
+        $this->eventDispatcher->dispatch(new DeletedEvent($existing, $context));
+
+        return $existing->getId();
+    }
+}
diff --git a/src/Service/Agent/Intent/ActionIntent.php b/src/Service/Agent/Intent/ActionIntent.php
deleted file mode 100644
index 792faf02d..000000000
--- a/src/Service/Agent/Intent/ActionIntent.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-/*
- * Fusio - Self-Hosted API Management for Builders.
- * For the current version and information visit <https://www.fusio-project.org/>
- *
- * Copyright (c) Christoph Kappestein <christoph.kappestein@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-namespace Fusio\Impl\Service\Agent\Intent;
-
-use Fusio\Impl\Service\Agent\IntentInterface;
-use Fusio\Impl\Service\Agent\Serializer\ResultSerializer;
-use Fusio\Model\Backend\AgentMessage;
-use Symfony\AI\Platform\Result\ResultInterface;
-
-/**
- * ActionIntent
- *
- * @author  Christoph Kappestein <christoph.kappestein@gmail.com>
- * @license http://www.apache.org/licenses/LICENSE-2.0
- * @link    https://www.fusio-project.org
- */
-readonly class ActionIntent implements IntentInterface
-{
-    public function __construct(private ResultSerializer $resultSerializer)
-    {
-    }
-
-    public function getMessage(): string
-    {
-        $hint = 'The user has the intent to develop a new action.' . "\n";
-        $hint.= 'Therefor you need to transform the provided business logic of the user message into PHP code.' . "\n";
-        $hint.= 'The resulting PHP code must be wrapped into the following code template:' . "\n";
-        $hint.= "\n";
-        $hint.= '<template>' . "\n";
-        $hint.= <<<PHP
-Action: [NAME]
-<?php
-
-use Fusio\Worker;
-use Fusio\Engine;
-use Psr\Log\LoggerInterface;
-
-return function(Worker\ExecuteRequest \$request, Worker\ExecuteContext \$context, Engine\ConnectorInterface \$connector, Engine\Response\FactoryInterface \$response, Engine\DispatcherInterface \$dispatcher, LoggerInterface \$logger) {
-
-[CODE]
-
-};
-
-PHP;
-        $hint.= '</template>' . "\n";
-        $hint.= "\n";
-        $hint.= 'Replace "[CODE]" with the code which you have generated.' . "\n";
-        $hint.= 'Replace "[NAME]" with a short and precise name as lower case and separated by hyphens which summarizes the business logic of the user message.' . "\n";
-        $hint.= "\n";
-        $hint.= 'If the business logic wants to interact with an external service i.e. a database or remote HTTP endpoint, then you can use the getConnection method at the connector argument to access those external services.' . "\n";
-        $hint.= 'You can get a list of all available connections through the "backend_connection_getAll" tool.' . "\n";
-        $hint.= "\n";
-        $hint.= 'Depending on the connection class the getConnection method returns a different instance, use the following mapping to better understand which implementation is used:';
-        $hint.= '* Fusio.Adapter.Amqp.Connection.Amqp = AMQPStreamConnection from the php-amqplib library' . "\n";
-        $hint.= '* Fusio.Adapter.Beanstalk.Connection.Beanstalk = Pheanstalk from the pheanstalk library' . "\n";
-        $hint.= '* Fusio.Adapter.File.Connection.Filesystem = FilesystemOperator from the Flysystem library' . "\n";
-        $hint.= '* Fusio.Adapter.Http.Connection.Http = Client from the Guzzle HTTP library' . "\n";
-        $hint.= '* Fusio.Adapter.Redis.Connection.Redis = Client from the predis library' . "\n";
-        $hint.= '* Fusio.Adapter.Smtp.Connection.Smtp = Mailer from the Symfony Mailer library' . "\n";
-        $hint.= '* Fusio.Adapter.Soap.Connection.Soap = SoapClient from the SOAP PHP extension' . "\n";
-        $hint.= '* Fusio.Impl.Connection.System = Connection from the Doctrine DBAL library' . "\n";
-        $hint.= '* Fusio.Adapter.Sql.Connection.Sql = Connection from the Doctrine DBAL library' . "\n";
-        $hint.= '* Fusio.Adapter.Sql.Connection.SqlAdvanced = Connection from the Doctrine DBAL library' . "\n";
-        $hint.= '* Fusio.Adapter.Stripe.Connection.Stripe = StripeClient from the Stripe PHP SDK' . "\n";
-        $hint.= "\n";
-        $hint.= 'If the business logic needs a database and there is no specific connection mentioned then use as default the "System" connection.' . "\n";
-        $hint.= 'If the business logic needs to work with a database table you can get all available tables for a specific connection through the "backend_database_getTables" tool where you need to provide a connection id.' . "\n";
-        $hint.= 'If you need to get a concrete table schema you can use the "backend_database_getTable" tool where you need to provide the connection id and table name.' . "\n";
-        $hint.= 'To add logging you can use the "$logger" argument which is a PSR-3 compatible logging interface.' . "\n";
-        $hint.= "\n";
-        $hint.= 'Methods which can be used inside an action:' . "\n";
-        $hint.= '* Get uri fragment or query parameter: $request->getArguments()->get([name])' . "\n";
-        $hint.= '* Get uri fragment or query parameter with a default value: $request->getArguments()->getOrDefault([name], [default])' . "\n";
-        $hint.= '* Get request payload: $request->getPayload()' . "\n";
-        $hint.= '* Get operation id: $context->getOperationId()' . "\n";
-        $hint.= '* Get base url: $context->getBaseUrl()' . "\n";
-        $hint.= '* Get user id: $context->getUser()->getId()' . "\n";
-        $hint.= '* Get user name: $context->getUser()->getName()' . "\n";
-        $hint.= '* Get user email: $context->getUser()->getEmail()' . "\n";
-        $hint.= '* Get user points: $context->getUser()->getPoints()' . "\n";
-        $hint.= '* Get connection: $connector->getConnection([connection_id])' . "\n";
-        $hint.= '* Dispatch event: $dispatcher->dispatch([event_name], [payload])' . "\n";
-        $hint.= '* Build response: $response->build([status_code], [headers], [body])' . "\n";
-        $hint.= "\n";
-        $hint.= 'The generated business logic must use the build method of the "$response" factory to return a result.' . "\n";
-        $hint.= 'Normally you do not need to set a Content-Type header or use "json_encode" since the framework handles the Content-Type and serializes the provided body into JSON.' . "\n";
-        $hint.= 'You only need to set a Content-Type and serialize the body if the user explicit wants to return a specific format like XML.' . "\n";
-        $hint.= "\n";
-
-        return $hint;
-    }
-
-    public function getTools(): array
-    {
-        return [
-            'backend_action_getAll',
-            'backend_action_get',
-            'backend_action_getClasses',
-            'backend_action_getForm',
-            'backend_action_get',
-            'backend_connection_getAll',
-            'backend_connection_get',
-            'backend_connection_database_getTables',
-            'backend_connection_database_getTable',
-            'backend_connection_filesystem_getAll',
-            'backend_connection_filesystem_get',
-            'backend_connection_http_execute',
-            'backend_connection_sdk_get',
-        ];
-    }
-
-    public function getResponseSchema(): ?array
-    {
-        return null;
-    }
-
-    public function transformResult(ResultInterface $result): AgentMessage
-    {
-        return $this->resultSerializer->serialize($result);
-    }
-}
diff --git a/src/Service/Agent/Intent/ArchitectIntent.php b/src/Service/Agent/Intent/ArchitectIntent.php
deleted file mode 100644
index ab6b32105..000000000
--- a/src/Service/Agent/Intent/ArchitectIntent.php
+++ /dev/null
@@ -1,235 +0,0 @@
-<?php
-/*
- * Fusio - Self-Hosted API Management for Builders.
- * For the current version and information visit <https://www.fusio-project.org/>
- *
- * Copyright (c) Christoph Kappestein <christoph.kappestein@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-namespace Fusio\Impl\Service\Agent\Intent;
-
-use Fusio\Impl\Service\Agent\IntentInterface;
-use Fusio\Impl\Service\Agent\Serializer\JsonResultSerializer;
-use Fusio\Model\Backend\AgentMessage;
-use Symfony\AI\Platform\Result\ResultInterface;
-
-/**
- * ArchitectIntent
- *
- * @author  Christoph Kappestein <christoph.kappestein@gmail.com>
- * @license http://www.apache.org/licenses/LICENSE-2.0
- * @link    https://www.fusio-project.org
- */
-readonly class ArchitectIntent implements IntentInterface
-{
-    public function __construct(private JsonResultSerializer $resultSerializer)
-    {
-    }
-
-    public function getMessage(): string
-    {
-        $hint = 'The user has the intent to design new API endpoints to solve the provided task.' . "\n";
-        $hint.= 'Therefor you need generate a list of operations and optional tables following the provided JSON schema.' . "\n";
-        $hint.= 'You should think like an REST API expert which has deep knowledge in describing API endpoints.' . "\n";
-        $hint.= 'The action of the operation should be described as text which is used later on by a different agent to generate the actual code.' . "\n";
-        $hint.= 'The incoming/outgoing schemas of the operation should be described as text which is used later on by a different agent to generate the actual schema.' . "\n";
-        $hint.= 'If the logic needs to persist data you also need to generate a fitting database table schemas.' . "\n";
-        $hint.= 'If needed describe in the action that the user id of the current authenticated user should be used, there is no need to create a dedicated user table since it already exists in the system.' . "\n";
-        $hint.= 'For primary key and user id columns it is preferred to use the type integer instead of guid.' . "\n";
-        $hint.= "\n";
-
-        return $hint;
-    }
-
-    public function getTools(): array
-    {
-        return [
-        ];
-    }
-
-    public function getResponseSchema(): ?array
-    {
-        return [
-            '$defs' => [
-                'Parameter' => [
-                    'description' => 'Object which represents a single query parameter',
-                    'type' => 'object',
-                    'properties' => [
-                        'description' => [
-                            'description' => 'A short description of this query parameter',
-                            'type' => 'string',
-                        ],
-                        'type' => [
-                            'description' => 'The data type of this query parameter',
-                            'type' => 'string',
-                            'enum' => ['string', 'integer', 'number', 'boolean'],
-                        ],
-                    ],
-                    'required' => ['description', 'type'],
-                    'additionalProperties' => false,
-                ],
-                'Parameters' => [
-                    'description' => 'A map which describes all query parameters, the key is the name of the parameter and the value describes the parameter',
-                    'type' => 'object',
-                    'additionalProperties' => [
-                        '$ref' => '#/$defs/Parameter',
-                    ],
-                ],
-                'Operation' => [
-                    'description' => 'Describes a single operation',
-                    'type' => 'object',
-                    'properties' => [
-                        'name' => [
-                            'description' => 'A short and precise name as lower case which summarizes the user message use dots to group operations into logical units',
-                            'type' => 'string',
-                        ],
-                        'active' => [
-                            'description' => 'Indicates whether the operation is active',
-                            'type' => 'boolean',
-                        ],
-                        'public' => [
-                            'description' => 'Indicates whether the operation is public, if true it is possible to invoke the operation without access token',
-                            'type' => 'boolean',
-                        ],
-                        'stability' => [
-                            'description' => 'The stability of the operation, normally this should be 1 = Experimental after testing it can be set to 2 = Stable',
-                            'type' => 'integer',
-                        ],
-                        'description' => [
-                            'description' => 'A description which explains the logic of this operation. This description is also used at the automatic OpenAPI generation so it should not contain any markdown',
-                            'type' => 'string',
-                        ],
-                        'httpMethod' => [
-                            'description' => 'The HTTP method must be one of: GET, POST, PUT, PATCH, DELETE',
-                            'type' => 'string',
-                        ],
-                        'httpPath' => [
-                            'description' => 'The HTTP path must start with a "/" for variable path fragments use the notation i.e. "/endpoint/:variable_fragment"',
-                            'type' => 'string',
-                        ],
-                        'httpCode' => [
-                            'description' => 'The HTTP success status code, normally this is 200 but for create operations it should be 201',
-                            'type' => 'integer',
-                        ],
-                        'parameters' => [
-                            'description' => 'Describes all query parameters for this operation',
-                            '$ref' => '#/$defs/Parameters',
-                        ],
-                        'incoming' => [
-                            'description' => 'Describe the request schema which is required for POST and PUT methods, this text is used by a different agent to generate the actual schema so it must be precise and optimized for an LLM',
-                            'type' => 'string',
-                        ],
-                        'outgoing' => [
-                            'description' => 'Describe the response schema, this text is used by a different agent to generate the actual schema so it must be precise and optimized for an LLM',
-                            'type' => 'string',
-                        ],
-                        'action' => [
-                            'description' => 'Describes the business logic of the action, this text is used by a different agent to generate the actual action so it must be precise and optimized for an LLM',
-                            'type' => 'string',
-                        ],
-                    ],
-                    'required' => ['name', 'active', 'public', 'stability', 'description', 'httpMethod', 'httpPath', 'httpCode', 'outgoing', 'action'],
-                    'additionalProperties' => false,
-                ],
-                'Table' => [
-                    'description' => 'Represents a table on a relational database',
-                    'type' => 'object',
-                    'properties' => [
-                        'name' => [
-                            'description' => 'Name of the table',
-                            'type' => 'string'
-                        ],
-                        'columns' => [
-                            'description' => 'List of table columns',
-                            'type' => 'array',
-                            'items' => [
-                                '$ref' => '#/$defs/Column',
-                            ],
-                        ],
-                        'primaryKey' => [
-                            'description' => 'The name of the primary key column',
-                            'type' => 'string'
-                        ],
-                    ],
-                ],
-                'Column' => [
-                    'description' => 'Represents a column on a table',
-                    'type' => 'object',
-                    'properties' => [
-                        'name' => [
-                            'description' => 'Name of the column',
-                            'type' => 'string'
-                        ],
-                        'type' => [
-                            'description' => 'Type of the column',
-                            'type' => 'string',
-                            'enum' => ['smallint', 'integer', 'bigint', 'string', 'text', 'guid', 'binary', 'blob', 'boolean', 'date', 'datetime', 'time', 'simple_array', 'json'],
-                        ],
-                        'length' => [
-                            'description' => 'Optional the max column length for string types',
-                            'type' => 'integer'
-                        ],
-                        'notNull' => [
-                            'description' => 'Indicates whether null is not allowed',
-                            'type' => 'boolean'
-                        ],
-                        'autoIncrement' => [
-                            'description' => 'Indicates whether the column is autoincrement, should be only used at the primary-key column',
-                            'type' => 'boolean'
-                        ],
-                        'precision' => [
-                            'description' => 'Optional for integer types a precision',
-                            'type' => 'integer'
-                        ],
-                        'scale' => [
-                            'description' => 'Optional for integer types a scale',
-                            'type' => 'integer'
-                        ],
-                        'default' => [
-                            'description' => 'Optional the default value for the column',
-                            'type' => 'string'
-                        ],
-                        'comment' => [
-                            'description' => 'Optional a comment for the column',
-                            'type' => 'string'
-                        ],
-                    ],
-                ],
-            ],
-            'type' => 'object',
-            'properties' => [
-                'operations' => [
-                    'description' => 'List of operations',
-                    'type' => 'array',
-                    'items' => [
-                        '$ref' => '#/$defs/Operation',
-                    ],
-                ],
-                'tables' => [
-                    'description' => 'List of tables',
-                    'type' => 'array',
-                    'items' => [
-                        '$ref' => '#/$defs/Table',
-                    ],
-                ],
-            ],
-        ];
-    }
-
-    public function transformResult(ResultInterface $result): AgentMessage
-    {
-        return $this->resultSerializer->serialize($result);
-    }
-}
diff --git a/src/Service/Agent/Intent/GeneralIntent.php b/src/Service/Agent/Intent/GeneralIntent.php
deleted file mode 100644
index cbf77128c..000000000
--- a/src/Service/Agent/Intent/GeneralIntent.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-/*
- * Fusio - Self-Hosted API Management for Builders.
- * For the current version and information visit <https://www.fusio-project.org/>
- *
- * Copyright (c) Christoph Kappestein <christoph.kappestein@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-namespace Fusio\Impl\Service\Agent\Intent;
-
-use Fusio\Impl\Service\Agent\IntentInterface;
-use Fusio\Impl\Service\Agent\Serializer\ResultSerializer;
-use Fusio\Model\Backend\AgentMessage;
-use Symfony\AI\Platform\Result\ResultInterface;
-
-/**
- * GeneralIntent
- *
- * @author  Christoph Kappestein <christoph.kappestein@gmail.com>
- * @license http://www.apache.org/licenses/LICENSE-2.0
- * @link    https://www.fusio-project.org
- */
-readonly class GeneralIntent implements IntentInterface
-{
-    public function __construct(private ResultSerializer $resultSerializer)
-    {
-    }
-
-    public function getMessage(): string
-    {
-        return '';
-    }
-
-    public function getTools(): array
-    {
-        return [
-            // api
-            'backend_operation_getAll',
-            'backend_operation_get',
-            'backend_action_getAll',
-            'backend_action_get',
-            'backend_action_getClasses',
-            'backend_action_getForm',
-            'backend_action_execute',
-            'backend_action_get',
-            'backend_schema_getAll',
-            'backend_schema_get',
-            'backend_connection_getAll',
-            'backend_connection_get',
-            'backend_connection_database_getTables',
-            'backend_connection_database_getTable',
-            'backend_connection_database_getRows',
-            'backend_connection_database_getRow',
-            'backend_connection_filesystem_getAll',
-            'backend_connection_filesystem_get',
-            'backend_connection_http_execute',
-            'backend_connection_sdk_get',
-            'backend_event_getAll',
-            'backend_event_get',
-            'backend_cronjob_getAll',
-            'backend_cronjob_get',
-            'backend_trigger_getAll',
-            'backend_trigger_get',
-
-            // consumer
-            'backend_app_getAll',
-            'backend_app_get',
-            'backend_scope_getAll',
-            'backend_scope_get',
-            'backend_user_getAll',
-            'backend_user_get',
-            'backend_rate_getAll',
-            'backend_rate_get',
-
-            // analytics
-            'backend_log_getAll',
-            'backend_log_get',
-            'backend_log_getAllErrors',
-            'backend_log_getError',
-            'backend_token_getAll',
-            'backend_token_get',
-
-            // plan
-            'backend_plan_getAll',
-            'backend_plan_get',
-            'backend_transaction_getAll',
-            'backend_transaction_get',
-        ];
-    }
-
-    public function getResponseSchema(): ?array
-    {
-        return null;
-    }
-
-    public function transformResult(ResultInterface $result): AgentMessage
-    {
-        return $this->resultSerializer->serialize($result);
-    }
-}
diff --git a/src/Service/Agent/Intent/SchemaIntent.php b/src/Service/Agent/Intent/SchemaIntent.php
deleted file mode 100644
index 36e03aeb9..000000000
--- a/src/Service/Agent/Intent/SchemaIntent.php
+++ /dev/null
@@ -1,227 +0,0 @@
-<?php
-/*
- * Fusio - Self-Hosted API Management for Builders.
- * For the current version and information visit <https://www.fusio-project.org/>
- *
- * Copyright (c) Christoph Kappestein <christoph.kappestein@gmail.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-namespace Fusio\Impl\Service\Agent\Intent;
-
-use Fusio\Impl\Service\Agent\IntentInterface;
-use Fusio\Impl\Service\Agent\Serializer\JsonResultSerializer;
-use Fusio\Model\Backend\AgentMessage;
-use Symfony\AI\Platform\Result\ResultInterface;
-
-/**
- * SchemaIntent
- *
- * @author  Christoph Kappestein <christoph.kappestein@gmail.com>
- * @license http://www.apache.org/licenses/LICENSE-2.0
- * @link    https://www.fusio-project.org
- */
-readonly class SchemaIntent implements IntentInterface
-{
-    public function __construct(private JsonResultSerializer $resultSerializer)
-    {
-    }
-
-    public function getMessage(): string
-    {
-        $hint = 'The user has the intent to develop a new schema.' . "\n";
-        $hint.= 'Therefor you need generate a JSON configuration which is used to create a new schema.' . "\n";
-        $hint.= 'The format of this schema is described in the provided JSON schema.' . "\n";
-        $hint.= "\n";
-        $hint.= 'Inside the configuration there is a source property where you need to generate a JSON TypeSchema specification.' . "\n";
-        $hint.= 'You need to transform the provided user message into a TypeSchema specification.' . "\n";
-        $hint.= 'The TypeSchema JSON structure is also described through the provided JSON schema.' . "\n";
-        $hint.= "\n";
-
-        return $hint;
-    }
-
-    public function getTools(): array
-    {
-        return [
-            'backend_schema_getAll',
-            'backend_schema_get',
-        ];
-    }
-
-    public function getResponseSchema(): ?array
-    {
-        return [
-            '$defs' => [
-                'TypeSchema' => [
-                    'description' => 'Describes a TypeSchema specification',
-                    'type' => 'object',
-                    'properties' => [
-                        'definitions' => [
-                            'description' => 'A map of definition types',
-                            'type' => 'object',
-                            'additionalProperties' => [
-                                '$ref' => '#/$defs/DefinitionType',
-                            ]
-                        ],
-                        'root' => [
-                            'description' => 'A reference to the root type which must be a key at the definitions map',
-                            'type' => 'string',
-                        ],
-                    ],
-                    'required' => ['definitions', 'root'],
-                    'additionalProperties' => false,
-                ],
-                'PropertyType' => [
-                    'anyOf' => [
-                        [
-                            'description' => 'Boolean type',
-                            'type' => 'object',
-                            'properties' => [
-                                'type' => [
-                                    'type' => 'string',
-                                    'enum' => ['boolean'],
-                                ],
-                            ],
-                            'required' => ['type'],
-                            'additionalProperties' => false,
-                        ],
-                        [
-                            'description' => 'Integer type',
-                            'type' => 'object',
-                            'properties' => [
-                                'type' => [
-                                    'type' => 'string',
-                                    'enum' => ['integer'],
-                                ],
-                            ],
-                            'required' => ['type'],
-                            'additionalProperties' => false,
-                        ],
-                        [
-                            'description' => 'Number type',
-                            'type' => 'object',
-                            'properties' => [
-                                'type' => [
-                                    'type' => 'string',
-                                    'enum' => ['number'],
-                                ],
-                            ],
-                            'required' => ['type'],
-                            'additionalProperties' => false,
-                        ],
-                        [
-                            'description' => 'String type',
-                            'type' => 'object',
-                            'properties' => [
-                                'type' => [
-                                    'type' => 'string',
-                                    'enum' => ['string'],
-                                ],
-                            ],
-                            'required' => ['type'],
-                            'additionalProperties' => false,
-                        ],
-                        [
-                            'description' => 'Reference type',
-                            'type' => 'object',
-                            'properties' => [
-                                'type' => [
-                                    'type' => 'string',
-                                    'enum' => ['reference'],
-                                ],
-                                'target' => [
-                                    'description' => 'The reference target must be a key which is available under the definitions object',
-                                    'type' => 'string',
-                                ],
-                            ],
-                            'required' => ['type', 'target'],
-                            'additionalProperties' => false,
-                        ],
-                    ],
-                ],
-                'DefinitionType' => [
-                    'anyOf' => [
-                        [
-                            'description' => 'Struct type',
-                            'type' => 'object',
-                            'properties' => [
-                                'type' => [
-                                    'type' => 'string',
-                                    'enum' => ['struct'],
-                                ],
-                                'properties' => [
-                                    'type' => 'object',
-                                    'additionalProperties' => [
-                                        '$ref' => '#/$defs/PropertyType',
-                                    ],
-                                ],
-                            ],
-                            'required' => ['type', 'properties'],
-                            'additionalProperties' => false,
-                        ],
-                        [
-                            'description' => 'Map type',
-                            'type' => 'object',
-                            'properties' => [
-                                'type' => [
-                                    'type' => 'string',
-                                    'enum' => ['map'],
-                                ],
-                                'schema' => [
-                                    '$ref' => '#/$defs/PropertyType',
-                                ],
-                            ],
-                            'required' => ['type', 'schema'],
-                            'additionalProperties' => false,
-                        ],
-                        [
-                            'description' => 'Array type',
-                            'type' => 'object',
-                            'properties' => [
-                                'type' => [
-                                    'type' => 'string',
-                                    'enum' => ['array'],
-                                ],
-                                'schema' => [
-                                    '$ref' => '#/$defs/PropertyType',
-                                ],
-                            ],
-                            'required' => ['type', 'schema'],
-                            'additionalProperties' => false,
-                        ],
-                    ],
-                ],
-            ],
-            'type' => 'object',
-            'properties' => [
-                'name' => [
-                    'description' => 'A short and precise name as lower case and separated by hyphens which summarizes the user message',
-                    'type' => 'string',
-                ],
-                'source' => [
-                    'description' => 'The TypeSchema specification',
-                    '$ref' => '#/$defs/TypeSchema',
-                ],
-            ],
-            'required' => ['definitions', 'root'],
-            'additionalProperties' => false,
-        ];
-    }
-
-    public function transformResult(ResultInterface $result): AgentMessage
-    {
-        return $this->resultSerializer->serialize($result);
-    }
-}
diff --git a/src/Service/Agent/Intent.php b/src/Service/Agent/Role.php
similarity index 76%
rename from src/Service/Agent/Intent.php
rename to src/Service/Agent/Role.php
index 7d1cb4b05..8ef41329a 100644
--- a/src/Service/Agent/Intent.php
+++ b/src/Service/Agent/Role.php
@@ -21,24 +21,15 @@
 namespace Fusio\Impl\Service\Agent;
 
 /**
- * Intent
+ * Role
  *
  * @author  Christoph Kappestein <christoph.kappestein@gmail.com>
  * @license http://www.apache.org/licenses/LICENSE-2.0
  * @link    https://www.fusio-project.org
  */
-enum Intent: string
+enum Role: string
 {
-    case ACTION = 'action';
-    case SCHEMA = 'schema';
-    case ARCHITECT = 'architect';
-
-    public function getInt(): int
-    {
-        return match ($this) {
-            self::ACTION => 1,
-            self::SCHEMA => 2,
-            self::ARCHITECT => 3,
-        };
-    }
+    case USER = 'user';
+    case ASSISTANT = 'assistant';
+    case SYSTEM = 'system';
 }
diff --git a/src/Service/Agent/Sender.php b/src/Service/Agent/Sender.php
index 60b316659..b3a164f12 100644
--- a/src/Service/Agent/Sender.php
+++ b/src/Service/Agent/Sender.php
@@ -20,28 +20,26 @@
 
 namespace Fusio\Impl\Service\Agent;
 
+use Fusio\Engine\ConnectorInterface;
+use Fusio\Engine\ContextInterface;
 use Fusio\Impl\Table;
+use Fusio\Model\Backend\AgentContent;
+use Fusio\Model\Backend\AgentContentObject;
+use Fusio\Model\Backend\AgentContentText;
 use Fusio\Model\Backend\AgentMessage;
-use Fusio\Model\Backend\AgentMessageBinary;
-use Fusio\Model\Backend\AgentMessageObject;
-use Fusio\Model\Backend\AgentMessageText;
-use Fusio\Model\Backend\AgentMessageToolCall;
-use Fusio\Model\Backend\AgentRequest;
-use Fusio\Model\Backend\AgentResponse;
-use PSX\Http\Exception\BadRequestException;
 use PSX\Http\Exception\InternalServerErrorException;
+use PSX\Http\Exception\NotFoundException;
 use PSX\Http\Exception\StatusCodeException;
 use PSX\Json\Parser;
+use PSX\Schema\Generator\JsonSchema;
 use PSX\Schema\ObjectMapper;
 use PSX\Schema\SchemaManager;
 use PSX\Schema\SchemaSource;
 use PSX\Sql\Condition;
 use PSX\Sql\OrderBy;
 use Symfony\AI\Agent\AgentInterface;
-use Symfony\AI\Platform\Message\Content\File;
 use Symfony\AI\Platform\Message\Message;
 use Symfony\AI\Platform\Message\MessageBag;
-use Symfony\AI\Platform\Result\ToolCall;
 use Throwable;
 
 /**
@@ -56,36 +54,42 @@
     /**
      * Max number of messages which are attached to the context
      */
-    public const CONTEXT_MESSAGES_LENGTH = 32;
+    public const CONTEXT_MESSAGES_LENGTH = 16;
 
     private ObjectMapper $objectMapper;
 
     public function __construct(
-        private IntentFactory $intentFactory,
-        private Serializer\MessageSerializer $messageSerializer,
         private Table\Agent $agentTable,
-        SchemaManager $schemaManager,
+        private Table\Agent\Message $messageTable,
+        private Serializer\MessageSerializer $messageSerializer,
+        private Serializer\ResultSerializer $resultSerializer,
+        private Serializer\JsonResultSerializer $jsonResultSerializer,
+        private Unserializer\MessageUnserializer $messageUnserializer,
+        private ConnectorInterface $connector,
+        private SchemaManager $schemaManager,
     ) {
         $this->objectMapper = new ObjectMapper($schemaManager);
     }
 
-    public function send(AgentInterface $agent, int $userId, int $connectionId, AgentRequest $request): AgentResponse
+    public function send(int $agentId, AgentContent $content, ContextInterface $context): AgentMessage
     {
+        $row = $this->agentTable->findOneByTenantAndId($context->getTenantId(), $context->getUser()->getCategoryId(), $agentId);
+        if (!$row instanceof Table\Generated\AgentRow) {
+            throw new NotFoundException('Could not find provided agent');
+        }
+
+        $agent = $this->connector->getConnection($row->getConnectionId());
+        if (!$agent instanceof AgentInterface) {
+            throw new InternalServerErrorException('Could not resolve agent connection');
+        }
+
         $this->agentTable->beginTransaction();
 
         try {
             $messages = new MessageBag();
-            $messages->add(Message::forSystem($this->getIntroduction()));
+            $messages->add(Message::forSystem($row->getIntroduction()));
 
-            $intent = Intent::tryFrom($request->getIntent() ?? '');
-            $intentProvider = $this->intentFactory->factory($intent);
-
-            $intentMessage = $intentProvider->getMessage();
-            if (!empty($intentMessage)) {
-                $messages->add(Message::forSystem($intentMessage));
-            }
-
-            $responseSchema = $intentProvider->getResponseSchema();
+            $responseSchema = $this->getResponseSchema($row);
             if ($responseSchema !== null) {
                 $schema = 'The output must be a valid JSON string and it must be possible to decode the output with a JSON parser.' . "\n";
                 $schema.= 'The generated JSON must follow the JSON schema:' . "\n";
@@ -96,16 +100,16 @@ public function send(AgentInterface $agent, int $userId, int $connectionId, Agen
                 $messages->add(Message::forSystem($schema));
             }
 
-            $messages = $this->loadPreviousMessages($userId, $connectionId, $intent, $messages);
+            $messages = $this->loadPreviousMessages($agentId, $context->getUser()->getId(), $messages);
 
-            $userMessages = $this->buildUserInput($request->getInput());
+            $userMessages = $this->messageUnserializer->unserialize($content);
 
-            $this->persistUserMessages($userId, $connectionId, $intent, $userMessages);
+            $this->persistUserMessages($agentId, $context->getUser()->getId(), $userMessages);
 
             $messages = $messages->merge($userMessages);
 
             $options = [
-                'tools' => $intentProvider->getTools(),
+                'tools' => $this->getTools($row),
                 'temperature' => 0.2,
             ];
 
@@ -113,7 +117,7 @@ public function send(AgentInterface $agent, int $userId, int $connectionId, Agen
                 $options['response_format'] = [
                     'type' => 'json_schema',
                     'json_schema' => [
-                        'name' => str_replace('\\', '-', $intentProvider::class),
+                        'name' => $row->getName(),
                         'strict' => true,
                         'schema' => $responseSchema,
                     ],
@@ -122,15 +126,25 @@ public function send(AgentInterface $agent, int $userId, int $connectionId, Agen
 
             $result = $agent->call($messages, $options);
 
-            $output = $intentProvider->transformResult($result);
+            if ($responseSchema !== null) {
+                $output = $this->jsonResultSerializer->serialize($result);
+            } else {
+                $output = $this->resultSerializer->serialize($result);
+            }
 
-            $this->agentTable->addAssistantMessage($userId, $connectionId, $intent, $output);
+            $messageRow = $this->messageTable->addAssistantMessage($row->getId(), $context->getUser()->getId(), $output);
 
             $this->agentTable->commit();
 
-            $response = new AgentResponse();
-            $response->setOutput($output);
-            return $response;
+            $message = new AgentMessage();
+            $message->setId($messageRow->getId());
+            $message->setRole(match ($messageRow->getOrigin()) {
+                Table\Agent\Message::ORIGIN_ASSISTANT => 'assistant',
+                Table\Agent\Message::ORIGIN_SYSTEM => 'system',
+                default => 'user',
+            });
+            $message->setContent($output);
+            return $message;
         } catch (Throwable $e) {
             $this->agentTable->rollBack();
 
@@ -142,48 +156,31 @@ public function send(AgentInterface $agent, int $userId, int $connectionId, Agen
         }
     }
 
-    private function getIntroduction(): string
-    {
-        $introduction = 'You are a helpful assistant in the context of Fusio an open source API management platform.' . "\n";
-        $introduction.= 'You help the user to configure or get information about the Fusio instance.' . "\n";
-        $introduction.= 'Fusio is based on the following entities which the user can use to build powerful REST APIs:' . "\n";
-        $introduction.= 'Operation: An Operation defines an API endpoint, it ties together an HTTP method and a path with an underlying action.' . "\n";
-        $introduction.= 'Action: An Action implements the actual business logic behind an endpoint.' . "\n";
-        $introduction.= 'Schema: A Schema defines the structure of a JSON payload.' . "\n";
-        $introduction.= 'Connection: A Connection defines how to reach an external service.' . "\n";
-        $introduction.= 'Event: An Event is a named occurrence emitted by an action when something significant happens.' . "\n";
-        $introduction.= 'Cronjob: A Cronjob schedules an action to run at regular intervals.' . "\n";
-        $introduction.= 'Trigger: A Trigger listens for a specific Event and executes an action.' . "\n";
-
-        return $introduction;
-    }
-
-    private function loadPreviousMessages(int $userId, int $connectionId, ?Intent $intent, MessageBag $messages): MessageBag
+    private function loadPreviousMessages(int $agentId, int $userId, MessageBag $messages): MessageBag
     {
         $condition = Condition::withAnd();
-        $condition->equals(Table\Generated\AgentColumn::USER_ID, $userId);
-        $condition->equals(Table\Generated\AgentColumn::CONNECTION_ID, $connectionId);
-        $condition->equals(Table\Generated\AgentColumn::INTENT, $intent?->getInt() ?? 0);
+        $condition->equals(Table\Generated\AgentMessageColumn::AGENT_ID, $agentId);
+        $condition->equals(Table\Generated\AgentMessageColumn::USER_ID, $userId);
 
-        $count = $this->agentTable->getCount($condition);
+        $count = $this->messageTable->getCount($condition);
         $startIndex = max(0, $count - self::CONTEXT_MESSAGES_LENGTH);
 
-        $result = $this->agentTable->findBy($condition, $startIndex, $count, Table\Generated\AgentColumn::ID, OrderBy::ASC);
-        foreach ($result as $chat) {
-            $message = $this->objectMapper->readJson($chat->getMessage(), SchemaSource::fromClass(AgentMessage::class));
+        $result = $this->messageTable->findBy($condition, $startIndex, $count, Table\Generated\AgentMessageColumn::ID, OrderBy::ASC);
+        foreach ($result as $row) {
+            $message = $this->objectMapper->readJson($row->getContent(), SchemaSource::fromClass(AgentContent::class));
 
-            if ($chat->getOrigin() === Table\Agent::ORIGIN_USER) {
-                $messages = $messages->merge($this->buildUserInput($message));
-            } elseif ($chat->getOrigin() === Table\Agent::ORIGIN_ASSISTANT) {
-                if ($message instanceof AgentMessageText) {
+            if ($row->getOrigin() === Table\Agent\Message::ORIGIN_USER) {
+                $messages = $messages->merge($this->messageUnserializer->unserialize($message));
+            } elseif ($row->getOrigin() === Table\Agent\Message::ORIGIN_ASSISTANT) {
+                if ($message instanceof AgentContentText) {
                     $messages->add(Message::ofAssistant($message->getContent()));
-                } elseif ($message instanceof AgentMessageObject) {
+                } elseif ($message instanceof AgentContentObject) {
                     $messages->add(Message::ofAssistant(Parser::encode($message->getPayload())));
                 }
-            } elseif ($chat->getOrigin() === Table\Agent::ORIGIN_SYSTEM) {
-                if ($message instanceof AgentMessageText) {
+            } elseif ($row->getOrigin() === Table\Agent\Message::ORIGIN_SYSTEM) {
+                if ($message instanceof AgentContentText) {
                     $messages->add(Message::forSystem($message->getContent()));
-                } elseif ($message instanceof AgentMessageObject) {
+                } elseif ($message instanceof AgentContentObject) {
                     $messages->add(Message::forSystem(Parser::encode($message->getPayload())));
                 }
             }
@@ -192,35 +189,44 @@ private function loadPreviousMessages(int $userId, int $connectionId, ?Intent $i
         return $messages;
     }
 
-    private function buildUserInput(AgentMessage $input): MessageBag
+    private function persistUserMessages(int $agentId, int $userId, MessageBag $userMessages): void
     {
-        $messages = new MessageBag();
-        if ($input instanceof AgentMessageText) {
-            $messages->add(Message::ofUser($input->getContent()));
-        } elseif ($input instanceof AgentMessageObject) {
-            $messages->add(Message::ofUser(Parser::encode($input->getPayload())));
-        } elseif ($input instanceof AgentMessageBinary) {
-            $messages->add(Message::ofUser(new File($input->getData(), $input->getMime())));
-        } elseif ($input instanceof AgentMessageToolCall) {
-            $functions = $input->getFunctions();
-            foreach ($functions as $function) {
-                $toolCall = new ToolCall($function->getId(), $function->getName(), Parser::decode($function->getArguments()));
-
-                $messages->add(Message::ofToolCall($toolCall, ''));
+        foreach ($userMessages as $userMessage) {
+            foreach ($this->messageSerializer->serialize($userMessage) as $content) {
+                $this->messageTable->addUserMessage($agentId, $userId, $content);
             }
-        } else {
-            throw new BadRequestException('Provided a not supported input type');
         }
+    }
 
-        return $messages;
+    private function getResponseSchema(Table\Generated\AgentRow $row): ?array
+    {
+        $outgoing = $row->getOutgoing();
+        if (empty($outgoing)) {
+            return null;
+        }
+
+        $schema = $this->schemaManager->getSchema($outgoing);
+
+        $jsonSchema = (new JsonSchema(inlineDefinitions: true))->toArray($schema->getDefinitions(), $schema->getRoot());
+        if (count($jsonSchema) === 0) {
+            return null;
+        }
+
+        return $jsonSchema;
     }
 
-    private function persistUserMessages(int $userId, int $connectionId, ?Intent $intent, MessageBag $userMessages): void
+    private function getTools(Table\Generated\AgentRow $row): array
     {
-        foreach ($userMessages as $userMessage) {
-            foreach ($this->messageSerializer->serialize($userMessage) as $item) {
-                $this->agentTable->addUserMessage($userId, $connectionId, $intent, $item);
-            }
+        $rawTools = $row->getTools();
+        if (empty($rawTools)) {
+            return [];
         }
+
+        $tools = Parser::decode($rawTools);
+        if (!is_array($tools)) {
+            return [];
+        }
+
+        return $tools;
     }
 }
diff --git a/src/Service/Agent/Serializer/JsonResultSerializer.php b/src/Service/Agent/Serializer/JsonResultSerializer.php
index 8044f0c46..887a27a63 100644
--- a/src/Service/Agent/Serializer/JsonResultSerializer.php
+++ b/src/Service/Agent/Serializer/JsonResultSerializer.php
@@ -20,8 +20,8 @@
 
 namespace Fusio\Impl\Service\Agent\Serializer;
 
-use Fusio\Model\Backend\AgentMessage;
-use Fusio\Model\Backend\AgentMessageObject;
+use Fusio\Model\Backend\AgentContent;
+use Fusio\Model\Backend\AgentContentObject;
 use stdClass;
 use Symfony\AI\Platform\Result\ResultInterface;
 use Symfony\AI\Platform\Result\TextResult;
@@ -35,7 +35,7 @@
  */
 readonly class JsonResultSerializer extends ResultSerializer
 {
-    public function serialize(ResultInterface $result): AgentMessage
+    public function serialize(ResultInterface $result): AgentContent
     {
         if ($result instanceof TextResult) {
             $content = $result->getContent();
@@ -47,7 +47,7 @@ public function serialize(ResultInterface $result): AgentMessage
 
             $payload = json_decode($content);
             if ($payload instanceof stdClass) {
-                $object = new AgentMessageObject();
+                $object = new AgentContentObject();
                 $object->setType('object');
                 $object->setPayload($payload);
                 return $object;
diff --git a/src/Service/Agent/Serializer/MessageSerializer.php b/src/Service/Agent/Serializer/MessageSerializer.php
index 36fd44c16..e14c6247e 100644
--- a/src/Service/Agent/Serializer/MessageSerializer.php
+++ b/src/Service/Agent/Serializer/MessageSerializer.php
@@ -20,11 +20,11 @@
 
 namespace Fusio\Impl\Service\Agent\Serializer;
 
-use Fusio\Model\Backend\AgentMessage;
-use Fusio\Model\Backend\AgentMessageBinary;
-use Fusio\Model\Backend\AgentMessageText;
-use Fusio\Model\Backend\AgentMessageToolCall;
-use Fusio\Model\Backend\AgentMessageToolCallFunction;
+use Fusio\Model\Backend\AgentContent;
+use Fusio\Model\Backend\AgentContentBinary;
+use Fusio\Model\Backend\AgentContentText;
+use Fusio\Model\Backend\AgentContentToolCall;
+use Fusio\Model\Backend\AgentContentToolCallFunction;
 use PSX\Json\Parser;
 use Symfony\AI\Platform\Message\Content\Collection;
 use Symfony\AI\Platform\Message\Content\ContentInterface;
@@ -46,19 +46,19 @@
 readonly class MessageSerializer
 {
     /**
-     * @return array<AgentMessage>
+     * @return array<AgentContent>
      */
     public function serialize(MessageInterface $message): array
     {
         if ($message instanceof ToolCallMessage) {
             $toolCall = $message->getToolCall();
 
-            $function = new AgentMessageToolCallFunction();
+            $function = new AgentContentToolCallFunction();
             $function->setName($toolCall->getName());
             $function->setArguments(Parser::encode($toolCall->getArguments()));
             $function->setId($toolCall->getId());
 
-            $result = new AgentMessageToolCall();
+            $result = new AgentContentToolCall();
             $result->setType('tool_call');
             $result->setFunctions([$function]);
 
@@ -73,7 +73,7 @@ public function serialize(MessageInterface $message): array
 
             return $result;
         } else {
-            $result = new AgentMessageText();
+            $result = new AgentContentText();
             $result->setType('text');
             $result->setContent($message->getContent());
 
@@ -82,25 +82,25 @@ public function serialize(MessageInterface $message): array
     }
 
     /**
-     * @return array<AgentMessage>
+     * @return array<AgentContent>
      */
     private function serializeContent(ContentInterface $content): array
     {
         if ($content instanceof File) {
-            $result = new AgentMessageBinary();
+            $result = new AgentContentBinary();
             $result->setType('binary');
             $result->setMime($content->getFormat());
             $result->setData($content->asBase64());
 
             return [$result];
         } elseif ($content instanceof Text) {
-            $result = new AgentMessageText();
+            $result = new AgentContentText();
             $result->setType('text');
             $result->setContent($content->getText());
 
             return [$result];
         } elseif ($content instanceof ImageUrl || $content instanceof DocumentUrl) {
-            $result = new AgentMessageText();
+            $result = new AgentContentText();
             $result->setType('text');
             $result->setContent($content->getUrl());
 
diff --git a/src/Service/Agent/Serializer/ResultSerializer.php b/src/Service/Agent/Serializer/ResultSerializer.php
index bcec9db76..738ad3b5d 100644
--- a/src/Service/Agent/Serializer/ResultSerializer.php
+++ b/src/Service/Agent/Serializer/ResultSerializer.php
@@ -20,21 +20,19 @@
 
 namespace Fusio\Impl\Service\Agent\Serializer;
 
-use Fusio\Model\Backend\AgentMessage;
-use Fusio\Model\Backend\AgentMessageBinary;
-use Fusio\Model\Backend\AgentMessageChoice;
-use Fusio\Model\Backend\AgentMessageObject;
-use Fusio\Model\Backend\AgentMessageStream;
-use Fusio\Model\Backend\AgentMessageText;
-use Fusio\Model\Backend\AgentMessageToolCall;
-use Fusio\Model\Backend\AgentMessageToolCallFunction;
+use Fusio\Model\Backend\AgentContent;
+use Fusio\Model\Backend\AgentContentBinary;
+use Fusio\Model\Backend\AgentContentChoice;
+use Fusio\Model\Backend\AgentContentObject;
+use Fusio\Model\Backend\AgentContentText;
+use Fusio\Model\Backend\AgentContentToolCall;
+use Fusio\Model\Backend\AgentContentToolCallFunction;
 use PSX\Http\Exception\InternalServerErrorException;
 use PSX\Json\Parser;
 use Symfony\AI\Platform\Result\BinaryResult;
 use Symfony\AI\Platform\Result\ChoiceResult;
 use Symfony\AI\Platform\Result\ObjectResult;
 use Symfony\AI\Platform\Result\ResultInterface;
-use Symfony\AI\Platform\Result\StreamResult;
 use Symfony\AI\Platform\Result\TextResult;
 use Symfony\AI\Platform\Result\ToolCallResult;
 
@@ -47,10 +45,10 @@
  */
 readonly class ResultSerializer
 {
-    public function serialize(ResultInterface $result): AgentMessage
+    public function serialize(ResultInterface $result): AgentContent
     {
         if ($result instanceof BinaryResult) {
-            $message = new AgentMessageBinary();
+            $message = new AgentContentBinary();
             $message->setType('binary');
             $message->setMime($result->getMimeType());
             $message->setData($result->toBase64());
@@ -60,37 +58,28 @@ public function serialize(ResultInterface $result): AgentMessage
                 $items[] = $this->serialize($item);
             }
 
-            $message = new AgentMessageChoice();
+            $message = new AgentContentChoice();
             $message->setType('choice');
             $message->setItems($items);
         } elseif ($result instanceof ObjectResult) {
-            $message = new AgentMessageObject();
+            $message = new AgentContentObject();
             $message->setType('object');
             $message->setPayload($result->getContent());
-        } elseif ($result instanceof StreamResult) {
-            $events = [];
-            foreach ($result->getContent() as $event) {
-                $events[] = $event;
-            }
-
-            $message = new AgentMessageStream();
-            $message->setType('stream');
-            $message->setEvents($events);
         } elseif ($result instanceof TextResult) {
-            $message = new AgentMessageText();
+            $message = new AgentContentText();
             $message->setType('text');
             $message->setContent($result->getContent());
         } elseif ($result instanceof ToolCallResult) {
             $functions = [];
             foreach ($result->getContent() as $toolCall) {
-                $function = new AgentMessageToolCallFunction();
+                $function = new AgentContentToolCallFunction();
                 $function->setName($toolCall->getName());
                 $function->setArguments(Parser::encode($toolCall->getArguments()));
                 $function->setId($toolCall->getId());
                 $functions[] = $function;
             }
 
-            $message = new AgentMessageToolCall();
+            $message = new AgentContentToolCall();
             $message->setType('tool_call');
             $message->setFunctions($functions);
         } else {
diff --git a/src/Service/Agent/Unserializer/MessageUnserializer.php b/src/Service/Agent/Unserializer/MessageUnserializer.php
new file mode 100644
index 000000000..034e8b4cc
--- /dev/null
+++ b/src/Service/Agent/Unserializer/MessageUnserializer.php
@@ -0,0 +1,66 @@
+<?php
+/*
+ * Fusio - Self-Hosted API Management for Builders.
+ * For the current version and information visit <https://www.fusio-project.org/>
+ *
+ * Copyright (c) Christoph Kappestein <christoph.kappestein@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Fusio\Impl\Service\Agent\Unserializer;
+
+use Fusio\Model\Backend\AgentContent;
+use Fusio\Model\Backend\AgentContentBinary;
+use Fusio\Model\Backend\AgentContentObject;
+use Fusio\Model\Backend\AgentContentText;
+use Fusio\Model\Backend\AgentContentToolCall;
+use PSX\Http\Exception\BadRequestException;
+use PSX\Json\Parser;
+use Symfony\AI\Platform\Message\Content\File;
+use Symfony\AI\Platform\Message\Message;
+use Symfony\AI\Platform\Message\MessageBag;
+use Symfony\AI\Platform\Result\ToolCall;
+
+/**
+ * MessageUnserializer
+ *
+ * @author  Christoph Kappestein <christoph.kappestein@gmail.com>
+ * @license http://www.apache.org/licenses/LICENSE-2.0
+ * @link    https://www.fusio-project.org
+ */
+readonly class MessageUnserializer
+{
+    public function unserialize(AgentContent $content): MessageBag
+    {
+        $messages = new MessageBag();
+        if ($content instanceof AgentContentText) {
+            $messages->add(Message::ofUser($content->getContent()));
+        } elseif ($content instanceof AgentContentObject) {
+            $messages->add(Message::ofUser(Parser::encode($content->getPayload())));
+        } elseif ($content instanceof AgentContentBinary) {
+            $messages->add(Message::ofUser(new File($content->getData(), $content->getMime())));
+        } elseif ($content instanceof AgentContentToolCall) {
+            $functions = $content->getFunctions();
+            foreach ($functions as $function) {
+                $toolCall = new ToolCall($function->getId(), $function->getName(), Parser::decode($function->getArguments()));
+
+                $messages->add(Message::ofToolCall($toolCall, ''));
+            }
+        } else {
+            throw new BadRequestException('Provided a not supported message content type');
+        }
+
+        return $messages;
+    }
+}
diff --git a/src/Service/Agent/Validator.php b/src/Service/Agent/Validator.php
new file mode 100644
index 000000000..9c55bad2d
--- /dev/null
+++ b/src/Service/Agent/Validator.php
@@ -0,0 +1,155 @@
+<?php
+/*
+ * Fusio - Self-Hosted API Management for Builders.
+ * For the current version and information visit <https://www.fusio-project.org/>
+ *
+ * Copyright (c) Christoph Kappestein <christoph.kappestein@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Fusio\Impl\Service\Agent;
+
+use Fusio\Engine\ConnectorInterface;
+use Fusio\Engine\Exception\ActionNotFoundException;
+use Fusio\Engine\Exception\ConnectionNotFoundException;
+use Fusio\Engine\Exception\FactoryResolveException;
+use Fusio\Engine\ProcessorInterface;
+use Fusio\Impl\Action\Scheme as ActionScheme;
+use Fusio\Impl\Service\Tenant\UsageLimiter;
+use Fusio\Impl\Table;
+use Fusio\Model\Backend\Agent;
+use Fusio\Model\Backend\SchemaSource;
+use PSX\Http\Exception as StatusCode;
+use PSX\Schema\Exception\SchemaException;
+use PSX\Schema\SchemaManagerInterface;
+use Symfony\AI\Agent\AgentInterface;
+
+/**
+ * Validator
+ *
+ * @author  Christoph Kappestein <christoph.kappestein@gmail.com>
+ * @license http://www.apache.org/licenses/LICENSE-2.0
+ * @link    https://www.fusio-project.org
+ */
+readonly class Validator
+{
+    public function __construct(
+        private Table\Agent $agentTable,
+        private Table\Action $actionTable,
+        private ConnectorInterface $connector,
+        private ProcessorInterface $processor,
+        private SchemaManagerInterface $schemaManager,
+        private UsageLimiter $usageLimiter
+    ) {
+    }
+
+    public function assert(Agent $agent, int $categoryId, ?string $tenantId, ?Table\Generated\AgentRow $existing = null): void
+    {
+        $this->usageLimiter->assertAgentCount($tenantId);
+
+        $name = $agent->getName();
+        if ($name !== null) {
+            $this->assertName($name, $tenantId, $existing);
+        } else {
+            if ($existing === null) {
+                throw new StatusCode\BadRequestException('Agent name must not be empty');
+            }
+        }
+
+        $type = $agent->getType();
+        if ($type !== null) {
+            $this->assertType($type);
+        }
+
+        $connection = $agent->getConnection();
+        if ($connection !== null) {
+            $this->assertConnection($connection);
+        } else {
+            if ($existing === null) {
+                throw new StatusCode\BadRequestException('Connection must not be empty');
+            }
+        }
+
+        $outgoing = $agent->getOutgoing();
+        if ($outgoing !== null) {
+            $this->assertSchema($outgoing);
+        }
+
+        $action = $agent->getAction();
+        if ($action !== null) {
+            $this->assertAction($action, $categoryId, $tenantId);
+        }
+    }
+
+    private function assertName(string $name, ?string $tenantId, ?Table\Generated\AgentRow $existing = null): void
+    {
+        if (empty($name) || !preg_match('/^[a-zA-Z0-9\\-]{3,255}$/', $name)) {
+            throw new StatusCode\BadRequestException('Invalid agent name');
+        }
+
+        if (($existing === null || $name !== $existing->getName()) && $this->agentTable->findOneByTenantAndName($tenantId, null, $name)) {
+            throw new StatusCode\BadRequestException('Agent already exists');
+        }
+    }
+
+    private function assertType(int $type): void
+    {
+        if (!in_array($type, [Table\Agent::TYPE_GENERAL, Table\Agent::TYPE_OPERATION, Table\Agent::TYPE_ACTION, Table\Agent::TYPE_SCHEMA], true)) {
+            throw new StatusCode\BadRequestException('Provided an invalid agent type');
+        }
+    }
+
+    private function assertConnection(int $connectionId): void
+    {
+        try {
+            $connection = $this->connector->getConnection($connectionId);
+        } catch (ConnectionNotFoundException) {
+            throw new StatusCode\BadRequestException('Provided connection is not available');
+        }
+
+        if (!$connection instanceof AgentInterface) {
+            throw new StatusCode\BadRequestException('Provided an invalid connection type, the connection must be an agent connection');
+        }
+    }
+
+    private function assertSchema(string $schema): void
+    {
+        try {
+            $this->schemaManager->getSchema($schema);
+        } catch (SchemaException) {
+            throw new StatusCode\BadRequestException('Could not resolve provided schema');
+        }
+    }
+
+    private function assertAction(string $action, int $categoryId, ?string $tenantId): void
+    {
+        $scheme = ActionScheme::wrap($action);
+        if (empty($scheme)) {
+            throw new StatusCode\BadRequestException('Action no value provided, you need to provide an existing action name as value');
+        }
+
+        if (str_starts_with($scheme, 'action://')) {
+            $row = $this->actionTable->findOneByTenantAndName($tenantId, $categoryId, substr($scheme, 9));
+            if (!$row instanceof Table\Generated\ActionRow) {
+                throw new StatusCode\BadRequestException('Action "' . $action . '" does not exist, you need to provide an existing action name as value');
+            }
+        }
+
+        try {
+            $this->processor->getAction($scheme);
+        } catch (ActionNotFoundException|FactoryResolveException $e) {
+            throw new StatusCode\BadRequestException('Action "' . $action . '" does not exist', $e);
+        }
+    }
+}
diff --git a/src/Service/Mcp/PromptLoader.php b/src/Service/Mcp/PromptLoader.php
index 9aa54fced..54a2cba28 100644
--- a/src/Service/Mcp/PromptLoader.php
+++ b/src/Service/Mcp/PromptLoader.php
@@ -20,12 +20,12 @@
 
 namespace Fusio\Impl\Service\Mcp;
 
-use Fusio\Impl\Service\Agent\Intent\ActionIntent;
-use Fusio\Impl\Service\Agent\Intent\ArchitectIntent;
-use Fusio\Impl\Service\Agent\Intent\SchemaIntent;
+use Fusio\Impl\Service\System\FrameworkConfig;
+use Fusio\Impl\Table;
 use Mcp\Capability\RegistryInterface;
 use Mcp\Schema\Prompt;
 use Mcp\Schema\PromptArgument;
+use PSX\Sql\Condition;
 use RuntimeException;
 
 /**
@@ -37,77 +37,33 @@
  */
 readonly class PromptLoader
 {
-    public function __construct(
-        private ActionIntent $actionIntent,
-        private SchemaIntent $schemaIntent,
-        private ArchitectIntent $architectIntent,
-    ) {
-    }
-
-    public function load(RegistryInterface $registry): void
-    {
-        $this->loadAction($registry);
-        $this->loadSchema($registry);
-        $this->loadArchitect($registry);
-    }
-
-    private function loadAction(RegistryInterface $registry): void
+    public function __construct(private Table\Agent $agentTable, private FrameworkConfig $frameworkConfig)
     {
-        $arguments = [];
-        $arguments[] = new PromptArgument('logic', 'Describe the business logic of a new action', true);
-
-        $prompt = new Prompt('new-action', 'Prompt which helps to create a new action', $arguments);
-
-        $registry->registerPrompt($prompt, function (array $arguments): array {
-            $logic = $arguments['logic'] ?? null;
-            if (!is_string($logic) || $logic === '') {
-                throw new RuntimeException('Could not extract logic from arguments, got: ' . var_export($arguments, true));
-            }
-
-            return [
-                ['role' => 'assistant', 'content' => $this->actionIntent->getMessage()],
-                ['role' => 'user', 'content' => $logic],
-            ];
-        });
     }
 
-    private function loadSchema(RegistryInterface $registry): void
-    {
-        $arguments = [];
-        $arguments[] = new PromptArgument('structure', 'Describe the structure of a new schema', true);
-
-        $prompt = new Prompt('new-schema', 'Prompt which helps to create a new schema', $arguments);
-
-        $registry->registerPrompt($prompt, function (array $arguments): array {
-            $structure = $arguments['structure'] ?? null;
-            if (!is_string($structure) || $structure === '') {
-                throw new RuntimeException('Could not extract structure from arguments, got: ' . var_export($arguments, true));
-            }
-
-            return [
-                ['role' => 'assistant', 'content' => $this->schemaIntent->getMessage()],
-                ['role' => 'user', 'content' => $structure],
-            ];
-        });
-    }
-
-    private function loadArchitect(RegistryInterface $registry): void
+    public function load(RegistryInterface $registry): void
     {
-        $arguments = [];
-        $arguments[] = new PromptArgument('description', 'Describe what you want to build from a high level view', true);
-
-        $prompt = new Prompt('architect', 'Prompt which helps to create complete systems from a high level view', $arguments);
-
-        $registry->registerPrompt($prompt, function (array $arguments): array {
-            $description = $arguments['description'] ?? null;
-            if (!is_string($description) || $description === '') {
-                throw new RuntimeException('Could not extract description from arguments, got: ' . var_export($arguments, true));
-            }
-
-            return [
-                ['role' => 'assistant', 'content' => $this->architectIntent->getMessage()],
-                ['role' => 'user', 'content' => $description],
-            ];
-        });
+        $condition = Condition::withAnd();
+        $condition->equals(Table\Agent::COLUMN_TENANT_ID, $this->frameworkConfig->getTenantId());
+
+        $result = $this->agentTable->findAll($condition);
+        foreach ($result as $row) {
+            $arguments = [];
+            $arguments[] = new PromptArgument('message', 'The message', true);
+
+            $prompt = new Prompt($row->getName(), $row->getDescription(), $arguments);
+
+            $registry->registerPrompt($prompt, function (array $arguments) use ($row): array {
+                $message = $arguments['message'] ?? null;
+                if (!is_string($message) || $message === '') {
+                    throw new RuntimeException('Could not extract message from arguments, got: ' . var_export($arguments, true));
+                }
+
+                return [
+                    ['role' => 'assistant', 'content' => $row->getIntroduction()],
+                    ['role' => 'user', 'content' => $message],
+                ];
+            });
+        }
     }
 }
diff --git a/src/Service/Tenant/LimiterInterface.php b/src/Service/Tenant/LimiterInterface.php
index 7fe25c89b..fb68c0cdd 100644
--- a/src/Service/Tenant/LimiterInterface.php
+++ b/src/Service/Tenant/LimiterInterface.php
@@ -30,6 +30,7 @@
 interface LimiterInterface
 {
     public function getActionCount(): int;
+    public function getAgentCount(): int;
     public function getAppCount(): int;
     public function getBundleCount(): int;
     public function getCategoryCount(): int;
diff --git a/src/Service/Tenant/UsageLimiter.php b/src/Service/Tenant/UsageLimiter.php
index 824641d7e..dee9c53f8 100644
--- a/src/Service/Tenant/UsageLimiter.php
+++ b/src/Service/Tenant/UsageLimiter.php
@@ -51,6 +51,15 @@ public function assertActionCount(?string $tenantId): void
         );
     }
 
+    public function assertAgentCount(?string $tenantId): void
+    {
+        $this->assert(
+            $this->getActualCount(Table\Generated\AgentTable::NAME, $tenantId),
+            $this->limiter->getAgentCount(),
+            'agent'
+        );
+    }
+
     public function assertAppCount(?string $tenantId): void
     {
         $this->assert(
diff --git a/src/Table/Agent.php b/src/Table/Agent.php
index 75fb051ed..6935a80b7 100644
--- a/src/Table/Agent.php
+++ b/src/Table/Agent.php
@@ -20,10 +20,7 @@
 
 namespace Fusio\Impl\Table;
 
-use Fusio\Impl\Service\Agent\Intent;
-use Fusio\Model\Backend\AgentMessage;
-use PSX\DateTime\LocalDateTime;
-use PSX\Json\Parser;
+use Fusio\Impl\Table\Generated\AgentRow;
 use PSX\Sql\Condition;
 
 /**
@@ -35,43 +32,42 @@
  */
 class Agent extends Generated\AgentTable
 {
-    public const ORIGIN_USER      = 0x1;
-    public const ORIGIN_ASSISTANT = 0x2;
-    public const ORIGIN_SYSTEM    = 0x3;
+    public const STATUS_ACTIVE  = 1;
+    public const STATUS_DELETED = 0;
 
-    public function addUserMessage(int $userId, int $connectionId, ?Intent $intent, AgentMessage $message): void
-    {
-        $this->addMessage($userId, $connectionId, self::ORIGIN_USER, $intent, $message);
-    }
+    public const TYPE_GENERAL = 0;
+    public const TYPE_OPERATION = 1;
+    public const TYPE_ACTION = 2;
+    public const TYPE_SCHEMA = 3;
 
-    public function addAssistantMessage(int $userId, int $connectionId, ?Intent $intent, AgentMessage $message): void
+    public function findOneByIdentifier(?string $tenantId, int $categoryId, string $id): ?AgentRow
     {
-        $this->addMessage($userId, $connectionId, self::ORIGIN_ASSISTANT, $intent, $message);
+        if (str_starts_with($id, '~')) {
+            return $this->findOneByTenantAndName($tenantId, $categoryId, urldecode(substr($id, 1)));
+        } else {
+            return $this->findOneByTenantAndId($tenantId, $categoryId, (int) $id);
+        }
     }
 
-    public function addSystemMessage(int $userId, int $connectionId, ?Intent $intent, AgentMessage $message): void
-    {
-        $this->addMessage($userId, $connectionId, self::ORIGIN_SYSTEM, $intent, $message);
-    }
-
-    public function reset(int $userId, int $connectionId): void
+    public function findOneByTenantAndId(?string $tenantId, int $categoryId, int $id): ?AgentRow
     {
         $condition = Condition::withAnd();
-        $condition->equals(Generated\AgentColumn::USER_ID, $userId);
-        $condition->equals(Generated\AgentColumn::CONNECTION_ID, $connectionId);
+        $condition->equals(self::COLUMN_TENANT_ID, $tenantId);
+        $condition->equals(self::COLUMN_CATEGORY_ID, $categoryId);
+        $condition->equals(self::COLUMN_ID, $id);
 
-        $this->deleteBy($condition);
+        return $this->findOneBy($condition);
     }
 
-    private function addMessage(int $userId, int $connectionId, int $origin, ?Intent $intent, AgentMessage $message): void
+    public function findOneByTenantAndName(?string $tenantId, ?int $categoryId, string $name): ?AgentRow
     {
-        $row = new Generated\AgentRow();
-        $row->setUserId($userId);
-        $row->setConnectionId($connectionId);
-        $row->setOrigin($origin);
-        $row->setIntent($intent?->getInt() ?? 0);
-        $row->setMessage(Parser::encode($message));
-        $row->setInsertDate(LocalDateTime::now());
-        $this->create($row);
+        $condition = Condition::withAnd();
+        $condition->equals(self::COLUMN_TENANT_ID, $tenantId);
+        if ($categoryId !== null) {
+            $condition->equals(self::COLUMN_CATEGORY_ID, $categoryId);
+        }
+        $condition->equals(self::COLUMN_NAME, $name);
+
+        return $this->findOneBy($condition);
     }
 }
diff --git a/src/Table/Agent/Message.php b/src/Table/Agent/Message.php
new file mode 100644
index 000000000..44f76f27d
--- /dev/null
+++ b/src/Table/Agent/Message.php
@@ -0,0 +1,80 @@
+<?php
+/*
+ * Fusio - Self-Hosted API Management for Builders.
+ * For the current version and information visit <https://www.fusio-project.org/>
+ *
+ * Copyright (c) Christoph Kappestein <christoph.kappestein@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Fusio\Impl\Table\Agent;
+
+use Fusio\Impl\Table\Generated;
+use Fusio\Model\Backend\AgentContent;
+use PSX\DateTime\LocalDateTime;
+use PSX\Json\Parser;
+use PSX\Sql\Condition;
+
+/**
+ * Message
+ *
+ * @author  Christoph Kappestein <christoph.kappestein@gmail.com>
+ * @license http://www.apache.org/licenses/LICENSE-2.0
+ * @link    https://www.fusio-project.org
+ */
+class Message extends Generated\AgentMessageTable
+{
+    public const ORIGIN_USER      = 0x1;
+    public const ORIGIN_ASSISTANT = 0x2;
+    public const ORIGIN_SYSTEM    = 0x3;
+
+    public function addUserMessage(int $agentId, int $userId, AgentContent $content): Generated\AgentMessageRow
+    {
+        return $this->addMessage($agentId, $userId, self::ORIGIN_USER, $content);
+    }
+
+    public function addAssistantMessage(int $agentId, int $userId, AgentContent $content): Generated\AgentMessageRow
+    {
+        return $this->addMessage($agentId, $userId, self::ORIGIN_ASSISTANT, $content);
+    }
+
+    public function addSystemMessage(int $agentId, int $userId, AgentContent $content): Generated\AgentMessageRow
+    {
+        return $this->addMessage($agentId, $userId, self::ORIGIN_SYSTEM, $content);
+    }
+
+    public function reset(int $agentId, int $userId): void
+    {
+        $condition = Condition::withAnd();
+        $condition->equals(Generated\AgentMessageColumn::AGENT_ID, $agentId);
+        $condition->equals(Generated\AgentMessageColumn::USER_ID, $userId);
+
+        $this->deleteBy($condition);
+    }
+
+    private function addMessage(int $agentId, int $userId, int $role, AgentContent $content): Generated\AgentMessageRow
+    {
+        $row = new Generated\AgentMessageRow();
+        $row->setAgentId($agentId);
+        $row->setUserId($userId);
+        $row->setOrigin($role);
+        $row->setContent(Parser::encode($content));
+        $row->setInsertDate(LocalDateTime::now());
+        $this->create($row);
+
+        $row->setId($this->getLastInsertId());
+
+        return $row;
+    }
+}
diff --git a/src/Table/Generated/ActionColumn.php b/src/Table/Generated/ActionColumn.php
index 8ced8c9c3..275e2f545 100644
--- a/src/Table/Generated/ActionColumn.php
+++ b/src/Table/Generated/ActionColumn.php
@@ -6,8 +6,8 @@ enum ActionColumn : string implements \PSX\Sql\ColumnInterface
 {
     case ID = \Fusio\Impl\Table\Generated\ActionTable::COLUMN_ID;
     case CATEGORY_ID = \Fusio\Impl\Table\Generated\ActionTable::COLUMN_CATEGORY_ID;
-    case TENANT_ID = \Fusio\Impl\Table\Generated\ActionTable::COLUMN_TENANT_ID;
     case TAXONOMY_ID = \Fusio\Impl\Table\Generated\ActionTable::COLUMN_TAXONOMY_ID;
+    case TENANT_ID = \Fusio\Impl\Table\Generated\ActionTable::COLUMN_TENANT_ID;
     case STATUS = \Fusio\Impl\Table\Generated\ActionTable::COLUMN_STATUS;
     case NAME = \Fusio\Impl\Table\Generated\ActionTable::COLUMN_NAME;
     case CLASS_ = \Fusio\Impl\Table\Generated\ActionTable::COLUMN_CLASS;
diff --git a/src/Table/Generated/ActionRow.php b/src/Table/Generated/ActionRow.php
index 80a6debff..f6f267588 100644
--- a/src/Table/Generated/ActionRow.php
+++ b/src/Table/Generated/ActionRow.php
@@ -6,8 +6,8 @@ class ActionRow implements \JsonSerializable, \PSX\Record\RecordableInterface
 {
     private ?int $id = null;
     private ?int $categoryId = null;
-    private ?string $tenantId = null;
     private ?int $taxonomyId = null;
+    private ?string $tenantId = null;
     private ?int $status = null;
     private ?string $name = null;
     private ?string $class = null;
@@ -31,14 +31,6 @@ public function getCategoryId(): int
     {
         return $this->categoryId ?? throw new \PSX\Sql\Exception\NoValueAvailable('No value for required column "category_id" was provided');
     }
-    public function setTenantId(?string $tenantId): void
-    {
-        $this->tenantId = $tenantId;
-    }
-    public function getTenantId(): ?string
-    {
-        return $this->tenantId;
-    }
     public function setTaxonomyId(?int $taxonomyId): void
     {
         $this->taxonomyId = $taxonomyId;
@@ -47,6 +39,14 @@ public function getTaxonomyId(): ?int
     {
         return $this->taxonomyId;
     }
+    public function setTenantId(?string $tenantId): void
+    {
+        $this->tenantId = $tenantId;
+    }
+    public function getTenantId(): ?string
+    {
+        return $this->tenantId;
+    }
     public function setStatus(int $status): void
     {
         $this->status = $status;
@@ -109,8 +109,8 @@ public function toRecord(): \PSX\Record\RecordInterface
         $record = new \PSX\Record\Record();
         $record->put('id', $this->id);
         $record->put('category_id', $this->categoryId);
-        $record->put('tenant_id', $this->tenantId);
         $record->put('taxonomy_id', $this->taxonomyId);
+        $record->put('tenant_id', $this->tenantId);
         $record->put('status', $this->status);
         $record->put('name', $this->name);
         $record->put('class', $this->class);
@@ -129,8 +129,8 @@ public static function from(array|\ArrayAccess $data): self
         $row = new self();
         $row->id = isset($data['id']) && is_int($data['id']) ? $data['id'] : null;
         $row->categoryId = isset($data['category_id']) && is_int($data['category_id']) ? $data['category_id'] : null;
-        $row->tenantId = isset($data['tenant_id']) && is_string($data['tenant_id']) ? $data['tenant_id'] : null;
         $row->taxonomyId = isset($data['taxonomy_id']) && is_int($data['taxonomy_id']) ? $data['taxonomy_id'] : null;
+        $row->tenantId = isset($data['tenant_id']) && is_string($data['tenant_id']) ? $data['tenant_id'] : null;
         $row->status = isset($data['status']) && is_int($data['status']) ? $data['status'] : null;
         $row->name = isset($data['name']) && is_string($data['name']) ? $data['name'] : null;
         $row->class = isset($data['class']) && is_string($data['class']) ? $data['class'] : null;
diff --git a/src/Table/Generated/ActionTable.php b/src/Table/Generated/ActionTable.php
index bfdd37e56..89486020b 100644
--- a/src/Table/Generated/ActionTable.php
+++ b/src/Table/Generated/ActionTable.php
@@ -10,8 +10,8 @@ class ActionTable extends \PSX\Sql\TableAbstract
     public const NAME = 'fusio_action';
     public const COLUMN_ID = 'id';
     public const COLUMN_CATEGORY_ID = 'category_id';
-    public const COLUMN_TENANT_ID = 'tenant_id';
     public const COLUMN_TAXONOMY_ID = 'taxonomy_id';
+    public const COLUMN_TENANT_ID = 'tenant_id';
     public const COLUMN_STATUS = 'status';
     public const COLUMN_NAME = 'name';
     public const COLUMN_CLASS = 'class';
@@ -25,7 +25,7 @@ public function getName(): string
     }
     public function getColumns(): array
     {
-        return [self::COLUMN_ID => 0x3020000a, self::COLUMN_CATEGORY_ID => 0x20000a, self::COLUMN_TENANT_ID => 0x40a00040, self::COLUMN_TAXONOMY_ID => 0x4020000a, self::COLUMN_STATUS => 0x20000a, self::COLUMN_NAME => 0xa000ff, self::COLUMN_CLASS => 0xa000ff, self::COLUMN_ASYNC => 0x400000, self::COLUMN_CONFIG => 0x40b00000, self::COLUMN_METADATA => 0x40b00000, self::COLUMN_DATE => 0x800000];
+        return [self::COLUMN_ID => 0x3020000a, self::COLUMN_CATEGORY_ID => 0x20000a, self::COLUMN_TAXONOMY_ID => 0x4020000a, self::COLUMN_TENANT_ID => 0x40a00040, self::COLUMN_STATUS => 0x20000a, self::COLUMN_NAME => 0xa000ff, self::COLUMN_CLASS => 0xa000ff, self::COLUMN_ASYNC => 0x400000, self::COLUMN_CONFIG => 0x40b00000, self::COLUMN_METADATA => 0x40b00000, self::COLUMN_DATE => 0x800000];
     }
     /**
      * @return array<\Fusio\Impl\Table\Generated\ActionRow>
@@ -137,74 +137,74 @@ public function deleteByCategoryId(int $value): int
      * @return array<\Fusio\Impl\Table\Generated\ActionRow>
      * @throws \PSX\Sql\Exception\QueryException
      */
-    public function findByTenantId(string $value, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\ActionColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
+    public function findByTaxonomyId(int $value, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\ActionColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->like('tenant_id', $value);
+        $condition->equals('taxonomy_id', $value);
         return $this->doFindBy($condition, $startIndex, $count, $sortBy, $sortOrder);
     }
     /**
      * @throws \PSX\Sql\Exception\QueryException
      */
-    public function findOneByTenantId(string $value): ?\Fusio\Impl\Table\Generated\ActionRow
+    public function findOneByTaxonomyId(int $value): ?\Fusio\Impl\Table\Generated\ActionRow
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->like('tenant_id', $value);
+        $condition->equals('taxonomy_id', $value);
         return $this->doFindOneBy($condition);
     }
     /**
      * @throws \PSX\Sql\Exception\ManipulationException
      */
-    public function updateByTenantId(string $value, \Fusio\Impl\Table\Generated\ActionRow $record): int
+    public function updateByTaxonomyId(int $value, \Fusio\Impl\Table\Generated\ActionRow $record): int
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->like('tenant_id', $value);
+        $condition->equals('taxonomy_id', $value);
         return $this->doUpdateBy($condition, $record->toRecord());
     }
     /**
      * @throws \PSX\Sql\Exception\ManipulationException
      */
-    public function deleteByTenantId(string $value): int
+    public function deleteByTaxonomyId(int $value): int
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->like('tenant_id', $value);
+        $condition->equals('taxonomy_id', $value);
         return $this->doDeleteBy($condition);
     }
     /**
      * @return array<\Fusio\Impl\Table\Generated\ActionRow>
      * @throws \PSX\Sql\Exception\QueryException
      */
-    public function findByTaxonomyId(int $value, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\ActionColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
+    public function findByTenantId(string $value, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\ActionColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->equals('taxonomy_id', $value);
+        $condition->like('tenant_id', $value);
         return $this->doFindBy($condition, $startIndex, $count, $sortBy, $sortOrder);
     }
     /**
      * @throws \PSX\Sql\Exception\QueryException
      */
-    public function findOneByTaxonomyId(int $value): ?\Fusio\Impl\Table\Generated\ActionRow
+    public function findOneByTenantId(string $value): ?\Fusio\Impl\Table\Generated\ActionRow
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->equals('taxonomy_id', $value);
+        $condition->like('tenant_id', $value);
         return $this->doFindOneBy($condition);
     }
     /**
      * @throws \PSX\Sql\Exception\ManipulationException
      */
-    public function updateByTaxonomyId(int $value, \Fusio\Impl\Table\Generated\ActionRow $record): int
+    public function updateByTenantId(string $value, \Fusio\Impl\Table\Generated\ActionRow $record): int
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->equals('taxonomy_id', $value);
+        $condition->like('tenant_id', $value);
         return $this->doUpdateBy($condition, $record->toRecord());
     }
     /**
      * @throws \PSX\Sql\Exception\ManipulationException
      */
-    public function deleteByTaxonomyId(int $value): int
+    public function deleteByTenantId(string $value): int
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->equals('taxonomy_id', $value);
+        $condition->like('tenant_id', $value);
         return $this->doDeleteBy($condition);
     }
     /**
diff --git a/src/Table/Generated/AgentColumn.php b/src/Table/Generated/AgentColumn.php
index 0e21899ec..6f2f12122 100644
--- a/src/Table/Generated/AgentColumn.php
+++ b/src/Table/Generated/AgentColumn.php
@@ -5,11 +5,17 @@
 enum AgentColumn : string implements \PSX\Sql\ColumnInterface
 {
     case ID = \Fusio\Impl\Table\Generated\AgentTable::COLUMN_ID;
-    case USER_ID = \Fusio\Impl\Table\Generated\AgentTable::COLUMN_USER_ID;
+    case CATEGORY_ID = \Fusio\Impl\Table\Generated\AgentTable::COLUMN_CATEGORY_ID;
     case CONNECTION_ID = \Fusio\Impl\Table\Generated\AgentTable::COLUMN_CONNECTION_ID;
     case TENANT_ID = \Fusio\Impl\Table\Generated\AgentTable::COLUMN_TENANT_ID;
-    case ORIGIN = \Fusio\Impl\Table\Generated\AgentTable::COLUMN_ORIGIN;
-    case INTENT = \Fusio\Impl\Table\Generated\AgentTable::COLUMN_INTENT;
-    case MESSAGE = \Fusio\Impl\Table\Generated\AgentTable::COLUMN_MESSAGE;
+    case STATUS = \Fusio\Impl\Table\Generated\AgentTable::COLUMN_STATUS;
+    case TYPE = \Fusio\Impl\Table\Generated\AgentTable::COLUMN_TYPE;
+    case NAME = \Fusio\Impl\Table\Generated\AgentTable::COLUMN_NAME;
+    case DESCRIPTION = \Fusio\Impl\Table\Generated\AgentTable::COLUMN_DESCRIPTION;
+    case INTRODUCTION = \Fusio\Impl\Table\Generated\AgentTable::COLUMN_INTRODUCTION;
+    case TOOLS = \Fusio\Impl\Table\Generated\AgentTable::COLUMN_TOOLS;
+    case OUTGOING = \Fusio\Impl\Table\Generated\AgentTable::COLUMN_OUTGOING;
+    case ACTION = \Fusio\Impl\Table\Generated\AgentTable::COLUMN_ACTION;
+    case METADATA = \Fusio\Impl\Table\Generated\AgentTable::COLUMN_METADATA;
     case INSERT_DATE = \Fusio\Impl\Table\Generated\AgentTable::COLUMN_INSERT_DATE;
 }
\ No newline at end of file
diff --git a/src/Table/Generated/AgentMessageColumn.php b/src/Table/Generated/AgentMessageColumn.php
new file mode 100644
index 000000000..9714991ce
--- /dev/null
+++ b/src/Table/Generated/AgentMessageColumn.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Fusio\Impl\Table\Generated;
+
+enum AgentMessageColumn : string implements \PSX\Sql\ColumnInterface
+{
+    case ID = \Fusio\Impl\Table\Generated\AgentMessageTable::COLUMN_ID;
+    case AGENT_ID = \Fusio\Impl\Table\Generated\AgentMessageTable::COLUMN_AGENT_ID;
+    case USER_ID = \Fusio\Impl\Table\Generated\AgentMessageTable::COLUMN_USER_ID;
+    case PARENT_ID = \Fusio\Impl\Table\Generated\AgentMessageTable::COLUMN_PARENT_ID;
+    case ORIGIN = \Fusio\Impl\Table\Generated\AgentMessageTable::COLUMN_ORIGIN;
+    case CONTENT = \Fusio\Impl\Table\Generated\AgentMessageTable::COLUMN_CONTENT;
+    case INSERT_DATE = \Fusio\Impl\Table\Generated\AgentMessageTable::COLUMN_INSERT_DATE;
+}
\ No newline at end of file
diff --git a/src/Table/Generated/AgentMessageRow.php b/src/Table/Generated/AgentMessageRow.php
new file mode 100644
index 000000000..f1deabc98
--- /dev/null
+++ b/src/Table/Generated/AgentMessageRow.php
@@ -0,0 +1,99 @@
+<?php
+
+namespace Fusio\Impl\Table\Generated;
+
+class AgentMessageRow implements \JsonSerializable, \PSX\Record\RecordableInterface
+{
+    private ?int $id = null;
+    private ?int $agentId = null;
+    private ?int $userId = null;
+    private ?int $parentId = null;
+    private ?int $origin = null;
+    private ?string $content = null;
+    private ?\PSX\DateTime\LocalDateTime $insertDate = null;
+    public function setId(int $id): void
+    {
+        $this->id = $id;
+    }
+    public function getId(): int
+    {
+        return $this->id ?? throw new \PSX\Sql\Exception\NoValueAvailable('No value for required column "id" was provided');
+    }
+    public function setAgentId(int $agentId): void
+    {
+        $this->agentId = $agentId;
+    }
+    public function getAgentId(): int
+    {
+        return $this->agentId ?? throw new \PSX\Sql\Exception\NoValueAvailable('No value for required column "agent_id" was provided');
+    }
+    public function setUserId(int $userId): void
+    {
+        $this->userId = $userId;
+    }
+    public function getUserId(): int
+    {
+        return $this->userId ?? throw new \PSX\Sql\Exception\NoValueAvailable('No value for required column "user_id" was provided');
+    }
+    public function setParentId(?int $parentId): void
+    {
+        $this->parentId = $parentId;
+    }
+    public function getParentId(): ?int
+    {
+        return $this->parentId;
+    }
+    public function setOrigin(int $origin): void
+    {
+        $this->origin = $origin;
+    }
+    public function getOrigin(): int
+    {
+        return $this->origin ?? throw new \PSX\Sql\Exception\NoValueAvailable('No value for required column "origin" was provided');
+    }
+    public function setContent(string $content): void
+    {
+        $this->content = $content;
+    }
+    public function getContent(): string
+    {
+        return $this->content ?? throw new \PSX\Sql\Exception\NoValueAvailable('No value for required column "content" was provided');
+    }
+    public function setInsertDate(\PSX\DateTime\LocalDateTime $insertDate): void
+    {
+        $this->insertDate = $insertDate;
+    }
+    public function getInsertDate(): \PSX\DateTime\LocalDateTime
+    {
+        return $this->insertDate ?? throw new \PSX\Sql\Exception\NoValueAvailable('No value for required column "insert_date" was provided');
+    }
+    public function toRecord(): \PSX\Record\RecordInterface
+    {
+        /** @var \PSX\Record\Record<mixed> $record */
+        $record = new \PSX\Record\Record();
+        $record->put('id', $this->id);
+        $record->put('agent_id', $this->agentId);
+        $record->put('user_id', $this->userId);
+        $record->put('parent_id', $this->parentId);
+        $record->put('origin', $this->origin);
+        $record->put('content', $this->content);
+        $record->put('insert_date', $this->insertDate);
+        return $record;
+    }
+    public function jsonSerialize(): object
+    {
+        return (object) $this->toRecord()->getAll();
+    }
+    public static function from(array|\ArrayAccess $data): self
+    {
+        $row = new self();
+        $row->id = isset($data['id']) && is_int($data['id']) ? $data['id'] : null;
+        $row->agentId = isset($data['agent_id']) && is_int($data['agent_id']) ? $data['agent_id'] : null;
+        $row->userId = isset($data['user_id']) && is_int($data['user_id']) ? $data['user_id'] : null;
+        $row->parentId = isset($data['parent_id']) && is_int($data['parent_id']) ? $data['parent_id'] : null;
+        $row->origin = isset($data['origin']) && is_int($data['origin']) ? $data['origin'] : null;
+        $row->content = isset($data['content']) && is_string($data['content']) ? $data['content'] : null;
+        $row->insertDate = isset($data['insert_date']) && $data['insert_date'] instanceof \DateTimeInterface ? \PSX\DateTime\LocalDateTime::from($data['insert_date']) : null;
+        return $row;
+    }
+}
\ No newline at end of file
diff --git a/src/Table/Generated/AgentMessageTable.php b/src/Table/Generated/AgentMessageTable.php
new file mode 100644
index 000000000..331daee05
--- /dev/null
+++ b/src/Table/Generated/AgentMessageTable.php
@@ -0,0 +1,359 @@
+<?php
+
+namespace Fusio\Impl\Table\Generated;
+
+/**
+ * @extends \PSX\Sql\TableAbstract<\Fusio\Impl\Table\Generated\AgentMessageRow>
+ */
+class AgentMessageTable extends \PSX\Sql\TableAbstract
+{
+    public const NAME = 'fusio_agent_message';
+    public const COLUMN_ID = 'id';
+    public const COLUMN_AGENT_ID = 'agent_id';
+    public const COLUMN_USER_ID = 'user_id';
+    public const COLUMN_PARENT_ID = 'parent_id';
+    public const COLUMN_ORIGIN = 'origin';
+    public const COLUMN_CONTENT = 'content';
+    public const COLUMN_INSERT_DATE = 'insert_date';
+    public function getName(): string
+    {
+        return self::NAME;
+    }
+    public function getColumns(): array
+    {
+        return [self::COLUMN_ID => 0x3020000a, self::COLUMN_AGENT_ID => 0x20000a, self::COLUMN_USER_ID => 0x20000a, self::COLUMN_PARENT_ID => 0x4020000a, self::COLUMN_ORIGIN => 0x20000a, self::COLUMN_CONTENT => 0xb00000, self::COLUMN_INSERT_DATE => 0x800000];
+    }
+    /**
+     * @return array<\Fusio\Impl\Table\Generated\AgentMessageRow>
+     * @throws \PSX\Sql\Exception\QueryException
+     */
+    public function findAll(?\PSX\Sql\Condition $condition = null, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\AgentMessageColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
+    {
+        return $this->doFindAll($condition, $startIndex, $count, $sortBy, $sortOrder);
+    }
+    /**
+     * @return array<\Fusio\Impl\Table\Generated\AgentMessageRow>
+     * @throws \PSX\Sql\Exception\QueryException
+     */
+    public function findBy(\PSX\Sql\Condition $condition, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\AgentMessageColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
+    {
+        return $this->doFindBy($condition, $startIndex, $count, $sortBy, $sortOrder);
+    }
+    /**
+     * @throws \PSX\Sql\Exception\QueryException
+     */
+    public function findOneBy(\PSX\Sql\Condition $condition): ?\Fusio\Impl\Table\Generated\AgentMessageRow
+    {
+        return $this->doFindOneBy($condition);
+    }
+    /**
+     * @throws \PSX\Sql\Exception\QueryException
+     */
+    public function find(int $id): ?\Fusio\Impl\Table\Generated\AgentMessageRow
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->equals('id', $id);
+        return $this->doFindOneBy($condition);
+    }
+    /**
+     * @return array<\Fusio\Impl\Table\Generated\AgentMessageRow>
+     * @throws \PSX\Sql\Exception\QueryException
+     */
+    public function findById(int $value, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\AgentMessageColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->equals('id', $value);
+        return $this->doFindBy($condition, $startIndex, $count, $sortBy, $sortOrder);
+    }
+    /**
+     * @throws \PSX\Sql\Exception\QueryException
+     */
+    public function findOneById(int $value): ?\Fusio\Impl\Table\Generated\AgentMessageRow
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->equals('id', $value);
+        return $this->doFindOneBy($condition);
+    }
+    /**
+     * @throws \PSX\Sql\Exception\ManipulationException
+     */
+    public function updateById(int $value, \Fusio\Impl\Table\Generated\AgentMessageRow $record): int
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->equals('id', $value);
+        return $this->doUpdateBy($condition, $record->toRecord());
+    }
+    /**
+     * @throws \PSX\Sql\Exception\ManipulationException
+     */
+    public function deleteById(int $value): int
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->equals('id', $value);
+        return $this->doDeleteBy($condition);
+    }
+    /**
+     * @return array<\Fusio\Impl\Table\Generated\AgentMessageRow>
+     * @throws \PSX\Sql\Exception\QueryException
+     */
+    public function findByAgentId(int $value, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\AgentMessageColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->equals('agent_id', $value);
+        return $this->doFindBy($condition, $startIndex, $count, $sortBy, $sortOrder);
+    }
+    /**
+     * @throws \PSX\Sql\Exception\QueryException
+     */
+    public function findOneByAgentId(int $value): ?\Fusio\Impl\Table\Generated\AgentMessageRow
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->equals('agent_id', $value);
+        return $this->doFindOneBy($condition);
+    }
+    /**
+     * @throws \PSX\Sql\Exception\ManipulationException
+     */
+    public function updateByAgentId(int $value, \Fusio\Impl\Table\Generated\AgentMessageRow $record): int
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->equals('agent_id', $value);
+        return $this->doUpdateBy($condition, $record->toRecord());
+    }
+    /**
+     * @throws \PSX\Sql\Exception\ManipulationException
+     */
+    public function deleteByAgentId(int $value): int
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->equals('agent_id', $value);
+        return $this->doDeleteBy($condition);
+    }
+    /**
+     * @return array<\Fusio\Impl\Table\Generated\AgentMessageRow>
+     * @throws \PSX\Sql\Exception\QueryException
+     */
+    public function findByUserId(int $value, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\AgentMessageColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->equals('user_id', $value);
+        return $this->doFindBy($condition, $startIndex, $count, $sortBy, $sortOrder);
+    }
+    /**
+     * @throws \PSX\Sql\Exception\QueryException
+     */
+    public function findOneByUserId(int $value): ?\Fusio\Impl\Table\Generated\AgentMessageRow
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->equals('user_id', $value);
+        return $this->doFindOneBy($condition);
+    }
+    /**
+     * @throws \PSX\Sql\Exception\ManipulationException
+     */
+    public function updateByUserId(int $value, \Fusio\Impl\Table\Generated\AgentMessageRow $record): int
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->equals('user_id', $value);
+        return $this->doUpdateBy($condition, $record->toRecord());
+    }
+    /**
+     * @throws \PSX\Sql\Exception\ManipulationException
+     */
+    public function deleteByUserId(int $value): int
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->equals('user_id', $value);
+        return $this->doDeleteBy($condition);
+    }
+    /**
+     * @return array<\Fusio\Impl\Table\Generated\AgentMessageRow>
+     * @throws \PSX\Sql\Exception\QueryException
+     */
+    public function findByParentId(int $value, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\AgentMessageColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->equals('parent_id', $value);
+        return $this->doFindBy($condition, $startIndex, $count, $sortBy, $sortOrder);
+    }
+    /**
+     * @throws \PSX\Sql\Exception\QueryException
+     */
+    public function findOneByParentId(int $value): ?\Fusio\Impl\Table\Generated\AgentMessageRow
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->equals('parent_id', $value);
+        return $this->doFindOneBy($condition);
+    }
+    /**
+     * @throws \PSX\Sql\Exception\ManipulationException
+     */
+    public function updateByParentId(int $value, \Fusio\Impl\Table\Generated\AgentMessageRow $record): int
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->equals('parent_id', $value);
+        return $this->doUpdateBy($condition, $record->toRecord());
+    }
+    /**
+     * @throws \PSX\Sql\Exception\ManipulationException
+     */
+    public function deleteByParentId(int $value): int
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->equals('parent_id', $value);
+        return $this->doDeleteBy($condition);
+    }
+    /**
+     * @return array<\Fusio\Impl\Table\Generated\AgentMessageRow>
+     * @throws \PSX\Sql\Exception\QueryException
+     */
+    public function findByOrigin(int $value, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\AgentMessageColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->equals('origin', $value);
+        return $this->doFindBy($condition, $startIndex, $count, $sortBy, $sortOrder);
+    }
+    /**
+     * @throws \PSX\Sql\Exception\QueryException
+     */
+    public function findOneByOrigin(int $value): ?\Fusio\Impl\Table\Generated\AgentMessageRow
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->equals('origin', $value);
+        return $this->doFindOneBy($condition);
+    }
+    /**
+     * @throws \PSX\Sql\Exception\ManipulationException
+     */
+    public function updateByOrigin(int $value, \Fusio\Impl\Table\Generated\AgentMessageRow $record): int
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->equals('origin', $value);
+        return $this->doUpdateBy($condition, $record->toRecord());
+    }
+    /**
+     * @throws \PSX\Sql\Exception\ManipulationException
+     */
+    public function deleteByOrigin(int $value): int
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->equals('origin', $value);
+        return $this->doDeleteBy($condition);
+    }
+    /**
+     * @return array<\Fusio\Impl\Table\Generated\AgentMessageRow>
+     * @throws \PSX\Sql\Exception\QueryException
+     */
+    public function findByContent(string $value, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\AgentMessageColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->like('content', $value);
+        return $this->doFindBy($condition, $startIndex, $count, $sortBy, $sortOrder);
+    }
+    /**
+     * @throws \PSX\Sql\Exception\QueryException
+     */
+    public function findOneByContent(string $value): ?\Fusio\Impl\Table\Generated\AgentMessageRow
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->like('content', $value);
+        return $this->doFindOneBy($condition);
+    }
+    /**
+     * @throws \PSX\Sql\Exception\ManipulationException
+     */
+    public function updateByContent(string $value, \Fusio\Impl\Table\Generated\AgentMessageRow $record): int
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->like('content', $value);
+        return $this->doUpdateBy($condition, $record->toRecord());
+    }
+    /**
+     * @throws \PSX\Sql\Exception\ManipulationException
+     */
+    public function deleteByContent(string $value): int
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->like('content', $value);
+        return $this->doDeleteBy($condition);
+    }
+    /**
+     * @return array<\Fusio\Impl\Table\Generated\AgentMessageRow>
+     * @throws \PSX\Sql\Exception\QueryException
+     */
+    public function findByInsertDate(\PSX\DateTime\LocalDateTime $value, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\AgentMessageColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->equals('insert_date', $value);
+        return $this->doFindBy($condition, $startIndex, $count, $sortBy, $sortOrder);
+    }
+    /**
+     * @throws \PSX\Sql\Exception\QueryException
+     */
+    public function findOneByInsertDate(\PSX\DateTime\LocalDateTime $value): ?\Fusio\Impl\Table\Generated\AgentMessageRow
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->equals('insert_date', $value);
+        return $this->doFindOneBy($condition);
+    }
+    /**
+     * @throws \PSX\Sql\Exception\ManipulationException
+     */
+    public function updateByInsertDate(\PSX\DateTime\LocalDateTime $value, \Fusio\Impl\Table\Generated\AgentMessageRow $record): int
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->equals('insert_date', $value);
+        return $this->doUpdateBy($condition, $record->toRecord());
+    }
+    /**
+     * @throws \PSX\Sql\Exception\ManipulationException
+     */
+    public function deleteByInsertDate(\PSX\DateTime\LocalDateTime $value): int
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->equals('insert_date', $value);
+        return $this->doDeleteBy($condition);
+    }
+    /**
+     * @throws \PSX\Sql\Exception\ManipulationException
+     */
+    public function create(\Fusio\Impl\Table\Generated\AgentMessageRow $record): int
+    {
+        return $this->doCreate($record->toRecord());
+    }
+    /**
+     * @throws \PSX\Sql\Exception\ManipulationException
+     */
+    public function update(\Fusio\Impl\Table\Generated\AgentMessageRow $record): int
+    {
+        return $this->doUpdate($record->toRecord());
+    }
+    /**
+     * @throws \PSX\Sql\Exception\ManipulationException
+     */
+    public function updateBy(\PSX\Sql\Condition $condition, \Fusio\Impl\Table\Generated\AgentMessageRow $record): int
+    {
+        return $this->doUpdateBy($condition, $record->toRecord());
+    }
+    /**
+     * @throws \PSX\Sql\Exception\ManipulationException
+     */
+    public function delete(\Fusio\Impl\Table\Generated\AgentMessageRow $record): int
+    {
+        return $this->doDelete($record->toRecord());
+    }
+    /**
+     * @throws \PSX\Sql\Exception\ManipulationException
+     */
+    public function deleteBy(\PSX\Sql\Condition $condition): int
+    {
+        return $this->doDeleteBy($condition);
+    }
+    /**
+     * @param array<string, mixed> $row
+     */
+    protected function newRecord(array $row): \Fusio\Impl\Table\Generated\AgentMessageRow
+    {
+        return \Fusio\Impl\Table\Generated\AgentMessageRow::from($row);
+    }
+}
\ No newline at end of file
diff --git a/src/Table/Generated/AgentRow.php b/src/Table/Generated/AgentRow.php
index 73602bd73..088bc8057 100644
--- a/src/Table/Generated/AgentRow.php
+++ b/src/Table/Generated/AgentRow.php
@@ -5,12 +5,18 @@
 class AgentRow implements \JsonSerializable, \PSX\Record\RecordableInterface
 {
     private ?int $id = null;
-    private ?int $userId = null;
+    private ?int $categoryId = null;
     private ?int $connectionId = null;
     private ?string $tenantId = null;
-    private ?int $origin = null;
-    private ?int $intent = null;
-    private ?string $message = null;
+    private ?int $status = null;
+    private ?int $type = null;
+    private ?string $name = null;
+    private ?string $description = null;
+    private ?string $introduction = null;
+    private ?string $tools = null;
+    private ?string $outgoing = null;
+    private ?string $action = null;
+    private ?string $metadata = null;
     private ?\PSX\DateTime\LocalDateTime $insertDate = null;
     public function setId(int $id): void
     {
@@ -20,13 +26,13 @@ public function getId(): int
     {
         return $this->id ?? throw new \PSX\Sql\Exception\NoValueAvailable('No value for required column "id" was provided');
     }
-    public function setUserId(int $userId): void
+    public function setCategoryId(int $categoryId): void
     {
-        $this->userId = $userId;
+        $this->categoryId = $categoryId;
     }
-    public function getUserId(): int
+    public function getCategoryId(): int
     {
-        return $this->userId ?? throw new \PSX\Sql\Exception\NoValueAvailable('No value for required column "user_id" was provided');
+        return $this->categoryId ?? throw new \PSX\Sql\Exception\NoValueAvailable('No value for required column "category_id" was provided');
     }
     public function setConnectionId(int $connectionId): void
     {
@@ -44,29 +50,77 @@ public function getTenantId(): ?string
     {
         return $this->tenantId;
     }
-    public function setOrigin(int $origin): void
+    public function setStatus(int $status): void
     {
-        $this->origin = $origin;
+        $this->status = $status;
     }
-    public function getOrigin(): int
+    public function getStatus(): int
     {
-        return $this->origin ?? throw new \PSX\Sql\Exception\NoValueAvailable('No value for required column "origin" was provided');
+        return $this->status ?? throw new \PSX\Sql\Exception\NoValueAvailable('No value for required column "status" was provided');
     }
-    public function setIntent(int $intent): void
+    public function setType(int $type): void
     {
-        $this->intent = $intent;
+        $this->type = $type;
     }
-    public function getIntent(): int
+    public function getType(): int
     {
-        return $this->intent ?? throw new \PSX\Sql\Exception\NoValueAvailable('No value for required column "intent" was provided');
+        return $this->type ?? throw new \PSX\Sql\Exception\NoValueAvailable('No value for required column "type" was provided');
     }
-    public function setMessage(string $message): void
+    public function setName(string $name): void
     {
-        $this->message = $message;
+        $this->name = $name;
     }
-    public function getMessage(): string
+    public function getName(): string
     {
-        return $this->message ?? throw new \PSX\Sql\Exception\NoValueAvailable('No value for required column "message" was provided');
+        return $this->name ?? throw new \PSX\Sql\Exception\NoValueAvailable('No value for required column "name" was provided');
+    }
+    public function setDescription(string $description): void
+    {
+        $this->description = $description;
+    }
+    public function getDescription(): string
+    {
+        return $this->description ?? throw new \PSX\Sql\Exception\NoValueAvailable('No value for required column "description" was provided');
+    }
+    public function setIntroduction(string $introduction): void
+    {
+        $this->introduction = $introduction;
+    }
+    public function getIntroduction(): string
+    {
+        return $this->introduction ?? throw new \PSX\Sql\Exception\NoValueAvailable('No value for required column "introduction" was provided');
+    }
+    public function setTools(?string $tools): void
+    {
+        $this->tools = $tools;
+    }
+    public function getTools(): ?string
+    {
+        return $this->tools;
+    }
+    public function setOutgoing(?string $outgoing): void
+    {
+        $this->outgoing = $outgoing;
+    }
+    public function getOutgoing(): ?string
+    {
+        return $this->outgoing;
+    }
+    public function setAction(?string $action): void
+    {
+        $this->action = $action;
+    }
+    public function getAction(): ?string
+    {
+        return $this->action;
+    }
+    public function setMetadata(?string $metadata): void
+    {
+        $this->metadata = $metadata;
+    }
+    public function getMetadata(): ?string
+    {
+        return $this->metadata;
     }
     public function setInsertDate(\PSX\DateTime\LocalDateTime $insertDate): void
     {
@@ -81,12 +135,18 @@ public function toRecord(): \PSX\Record\RecordInterface
         /** @var \PSX\Record\Record<mixed> $record */
         $record = new \PSX\Record\Record();
         $record->put('id', $this->id);
-        $record->put('user_id', $this->userId);
+        $record->put('category_id', $this->categoryId);
         $record->put('connection_id', $this->connectionId);
         $record->put('tenant_id', $this->tenantId);
-        $record->put('origin', $this->origin);
-        $record->put('intent', $this->intent);
-        $record->put('message', $this->message);
+        $record->put('status', $this->status);
+        $record->put('type', $this->type);
+        $record->put('name', $this->name);
+        $record->put('description', $this->description);
+        $record->put('introduction', $this->introduction);
+        $record->put('tools', $this->tools);
+        $record->put('outgoing', $this->outgoing);
+        $record->put('action', $this->action);
+        $record->put('metadata', $this->metadata);
         $record->put('insert_date', $this->insertDate);
         return $record;
     }
@@ -98,12 +158,18 @@ public static function from(array|\ArrayAccess $data): self
     {
         $row = new self();
         $row->id = isset($data['id']) && is_int($data['id']) ? $data['id'] : null;
-        $row->userId = isset($data['user_id']) && is_int($data['user_id']) ? $data['user_id'] : null;
+        $row->categoryId = isset($data['category_id']) && is_int($data['category_id']) ? $data['category_id'] : null;
         $row->connectionId = isset($data['connection_id']) && is_int($data['connection_id']) ? $data['connection_id'] : null;
         $row->tenantId = isset($data['tenant_id']) && is_string($data['tenant_id']) ? $data['tenant_id'] : null;
-        $row->origin = isset($data['origin']) && is_int($data['origin']) ? $data['origin'] : null;
-        $row->intent = isset($data['intent']) && is_int($data['intent']) ? $data['intent'] : null;
-        $row->message = isset($data['message']) && is_string($data['message']) ? $data['message'] : null;
+        $row->status = isset($data['status']) && is_int($data['status']) ? $data['status'] : null;
+        $row->type = isset($data['type']) && is_int($data['type']) ? $data['type'] : null;
+        $row->name = isset($data['name']) && is_string($data['name']) ? $data['name'] : null;
+        $row->description = isset($data['description']) && is_string($data['description']) ? $data['description'] : null;
+        $row->introduction = isset($data['introduction']) && is_string($data['introduction']) ? $data['introduction'] : null;
+        $row->tools = isset($data['tools']) && is_string($data['tools']) ? $data['tools'] : null;
+        $row->outgoing = isset($data['outgoing']) && is_string($data['outgoing']) ? $data['outgoing'] : null;
+        $row->action = isset($data['action']) && is_string($data['action']) ? $data['action'] : null;
+        $row->metadata = isset($data['metadata']) && is_string($data['metadata']) ? $data['metadata'] : null;
         $row->insertDate = isset($data['insert_date']) && $data['insert_date'] instanceof \DateTimeInterface ? \PSX\DateTime\LocalDateTime::from($data['insert_date']) : null;
         return $row;
     }
diff --git a/src/Table/Generated/AgentTable.php b/src/Table/Generated/AgentTable.php
index bd64d4ea2..1457e9700 100644
--- a/src/Table/Generated/AgentTable.php
+++ b/src/Table/Generated/AgentTable.php
@@ -9,12 +9,18 @@ class AgentTable extends \PSX\Sql\TableAbstract
 {
     public const NAME = 'fusio_agent';
     public const COLUMN_ID = 'id';
-    public const COLUMN_USER_ID = 'user_id';
+    public const COLUMN_CATEGORY_ID = 'category_id';
     public const COLUMN_CONNECTION_ID = 'connection_id';
     public const COLUMN_TENANT_ID = 'tenant_id';
-    public const COLUMN_ORIGIN = 'origin';
-    public const COLUMN_INTENT = 'intent';
-    public const COLUMN_MESSAGE = 'message';
+    public const COLUMN_STATUS = 'status';
+    public const COLUMN_TYPE = 'type';
+    public const COLUMN_NAME = 'name';
+    public const COLUMN_DESCRIPTION = 'description';
+    public const COLUMN_INTRODUCTION = 'introduction';
+    public const COLUMN_TOOLS = 'tools';
+    public const COLUMN_OUTGOING = 'outgoing';
+    public const COLUMN_ACTION = 'action';
+    public const COLUMN_METADATA = 'metadata';
     public const COLUMN_INSERT_DATE = 'insert_date';
     public function getName(): string
     {
@@ -22,7 +28,7 @@ public function getName(): string
     }
     public function getColumns(): array
     {
-        return [self::COLUMN_ID => 0x3020000a, self::COLUMN_USER_ID => 0x20000a, self::COLUMN_CONNECTION_ID => 0x20000a, self::COLUMN_TENANT_ID => 0x40a00040, self::COLUMN_ORIGIN => 0x20000a, self::COLUMN_INTENT => 0x20000a, self::COLUMN_MESSAGE => 0xb00000, self::COLUMN_INSERT_DATE => 0x800000];
+        return [self::COLUMN_ID => 0x3020000a, self::COLUMN_CATEGORY_ID => 0x20000a, self::COLUMN_CONNECTION_ID => 0x20000a, self::COLUMN_TENANT_ID => 0x40a00040, self::COLUMN_STATUS => 0x20000a, self::COLUMN_TYPE => 0x20000a, self::COLUMN_NAME => 0xa000ff, self::COLUMN_DESCRIPTION => 0xa000ff, self::COLUMN_INTRODUCTION => 0xb00000, self::COLUMN_TOOLS => 0x40b00000, self::COLUMN_OUTGOING => 0x40a000ff, self::COLUMN_ACTION => 0x40a000ff, self::COLUMN_METADATA => 0x40b00000, self::COLUMN_INSERT_DATE => 0x800000];
     }
     /**
      * @return array<\Fusio\Impl\Table\Generated\AgentRow>
@@ -97,37 +103,37 @@ public function deleteById(int $value): int
      * @return array<\Fusio\Impl\Table\Generated\AgentRow>
      * @throws \PSX\Sql\Exception\QueryException
      */
-    public function findByUserId(int $value, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\AgentColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
+    public function findByCategoryId(int $value, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\AgentColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->equals('user_id', $value);
+        $condition->equals('category_id', $value);
         return $this->doFindBy($condition, $startIndex, $count, $sortBy, $sortOrder);
     }
     /**
      * @throws \PSX\Sql\Exception\QueryException
      */
-    public function findOneByUserId(int $value): ?\Fusio\Impl\Table\Generated\AgentRow
+    public function findOneByCategoryId(int $value): ?\Fusio\Impl\Table\Generated\AgentRow
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->equals('user_id', $value);
+        $condition->equals('category_id', $value);
         return $this->doFindOneBy($condition);
     }
     /**
      * @throws \PSX\Sql\Exception\ManipulationException
      */
-    public function updateByUserId(int $value, \Fusio\Impl\Table\Generated\AgentRow $record): int
+    public function updateByCategoryId(int $value, \Fusio\Impl\Table\Generated\AgentRow $record): int
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->equals('user_id', $value);
+        $condition->equals('category_id', $value);
         return $this->doUpdateBy($condition, $record->toRecord());
     }
     /**
      * @throws \PSX\Sql\Exception\ManipulationException
      */
-    public function deleteByUserId(int $value): int
+    public function deleteByCategoryId(int $value): int
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->equals('user_id', $value);
+        $condition->equals('category_id', $value);
         return $this->doDeleteBy($condition);
     }
     /**
@@ -208,111 +214,333 @@ public function deleteByTenantId(string $value): int
      * @return array<\Fusio\Impl\Table\Generated\AgentRow>
      * @throws \PSX\Sql\Exception\QueryException
      */
-    public function findByOrigin(int $value, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\AgentColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
+    public function findByStatus(int $value, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\AgentColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->equals('origin', $value);
+        $condition->equals('status', $value);
         return $this->doFindBy($condition, $startIndex, $count, $sortBy, $sortOrder);
     }
     /**
      * @throws \PSX\Sql\Exception\QueryException
      */
-    public function findOneByOrigin(int $value): ?\Fusio\Impl\Table\Generated\AgentRow
+    public function findOneByStatus(int $value): ?\Fusio\Impl\Table\Generated\AgentRow
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->equals('origin', $value);
+        $condition->equals('status', $value);
         return $this->doFindOneBy($condition);
     }
     /**
      * @throws \PSX\Sql\Exception\ManipulationException
      */
-    public function updateByOrigin(int $value, \Fusio\Impl\Table\Generated\AgentRow $record): int
+    public function updateByStatus(int $value, \Fusio\Impl\Table\Generated\AgentRow $record): int
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->equals('origin', $value);
+        $condition->equals('status', $value);
         return $this->doUpdateBy($condition, $record->toRecord());
     }
     /**
      * @throws \PSX\Sql\Exception\ManipulationException
      */
-    public function deleteByOrigin(int $value): int
+    public function deleteByStatus(int $value): int
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->equals('origin', $value);
+        $condition->equals('status', $value);
         return $this->doDeleteBy($condition);
     }
     /**
      * @return array<\Fusio\Impl\Table\Generated\AgentRow>
      * @throws \PSX\Sql\Exception\QueryException
      */
-    public function findByIntent(int $value, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\AgentColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
+    public function findByType(int $value, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\AgentColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->equals('intent', $value);
+        $condition->equals('type', $value);
         return $this->doFindBy($condition, $startIndex, $count, $sortBy, $sortOrder);
     }
     /**
      * @throws \PSX\Sql\Exception\QueryException
      */
-    public function findOneByIntent(int $value): ?\Fusio\Impl\Table\Generated\AgentRow
+    public function findOneByType(int $value): ?\Fusio\Impl\Table\Generated\AgentRow
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->equals('intent', $value);
+        $condition->equals('type', $value);
         return $this->doFindOneBy($condition);
     }
     /**
      * @throws \PSX\Sql\Exception\ManipulationException
      */
-    public function updateByIntent(int $value, \Fusio\Impl\Table\Generated\AgentRow $record): int
+    public function updateByType(int $value, \Fusio\Impl\Table\Generated\AgentRow $record): int
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->equals('intent', $value);
+        $condition->equals('type', $value);
         return $this->doUpdateBy($condition, $record->toRecord());
     }
     /**
      * @throws \PSX\Sql\Exception\ManipulationException
      */
-    public function deleteByIntent(int $value): int
+    public function deleteByType(int $value): int
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->equals('intent', $value);
+        $condition->equals('type', $value);
         return $this->doDeleteBy($condition);
     }
     /**
      * @return array<\Fusio\Impl\Table\Generated\AgentRow>
      * @throws \PSX\Sql\Exception\QueryException
      */
-    public function findByMessage(string $value, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\AgentColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
+    public function findByName(string $value, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\AgentColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->like('message', $value);
+        $condition->like('name', $value);
         return $this->doFindBy($condition, $startIndex, $count, $sortBy, $sortOrder);
     }
     /**
      * @throws \PSX\Sql\Exception\QueryException
      */
-    public function findOneByMessage(string $value): ?\Fusio\Impl\Table\Generated\AgentRow
+    public function findOneByName(string $value): ?\Fusio\Impl\Table\Generated\AgentRow
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->like('message', $value);
+        $condition->like('name', $value);
         return $this->doFindOneBy($condition);
     }
     /**
      * @throws \PSX\Sql\Exception\ManipulationException
      */
-    public function updateByMessage(string $value, \Fusio\Impl\Table\Generated\AgentRow $record): int
+    public function updateByName(string $value, \Fusio\Impl\Table\Generated\AgentRow $record): int
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->like('message', $value);
+        $condition->like('name', $value);
         return $this->doUpdateBy($condition, $record->toRecord());
     }
     /**
      * @throws \PSX\Sql\Exception\ManipulationException
      */
-    public function deleteByMessage(string $value): int
+    public function deleteByName(string $value): int
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->like('message', $value);
+        $condition->like('name', $value);
+        return $this->doDeleteBy($condition);
+    }
+    /**
+     * @return array<\Fusio\Impl\Table\Generated\AgentRow>
+     * @throws \PSX\Sql\Exception\QueryException
+     */
+    public function findByDescription(string $value, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\AgentColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->like('description', $value);
+        return $this->doFindBy($condition, $startIndex, $count, $sortBy, $sortOrder);
+    }
+    /**
+     * @throws \PSX\Sql\Exception\QueryException
+     */
+    public function findOneByDescription(string $value): ?\Fusio\Impl\Table\Generated\AgentRow
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->like('description', $value);
+        return $this->doFindOneBy($condition);
+    }
+    /**
+     * @throws \PSX\Sql\Exception\ManipulationException
+     */
+    public function updateByDescription(string $value, \Fusio\Impl\Table\Generated\AgentRow $record): int
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->like('description', $value);
+        return $this->doUpdateBy($condition, $record->toRecord());
+    }
+    /**
+     * @throws \PSX\Sql\Exception\ManipulationException
+     */
+    public function deleteByDescription(string $value): int
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->like('description', $value);
+        return $this->doDeleteBy($condition);
+    }
+    /**
+     * @return array<\Fusio\Impl\Table\Generated\AgentRow>
+     * @throws \PSX\Sql\Exception\QueryException
+     */
+    public function findByIntroduction(string $value, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\AgentColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->like('introduction', $value);
+        return $this->doFindBy($condition, $startIndex, $count, $sortBy, $sortOrder);
+    }
+    /**
+     * @throws \PSX\Sql\Exception\QueryException
+     */
+    public function findOneByIntroduction(string $value): ?\Fusio\Impl\Table\Generated\AgentRow
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->like('introduction', $value);
+        return $this->doFindOneBy($condition);
+    }
+    /**
+     * @throws \PSX\Sql\Exception\ManipulationException
+     */
+    public function updateByIntroduction(string $value, \Fusio\Impl\Table\Generated\AgentRow $record): int
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->like('introduction', $value);
+        return $this->doUpdateBy($condition, $record->toRecord());
+    }
+    /**
+     * @throws \PSX\Sql\Exception\ManipulationException
+     */
+    public function deleteByIntroduction(string $value): int
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->like('introduction', $value);
+        return $this->doDeleteBy($condition);
+    }
+    /**
+     * @return array<\Fusio\Impl\Table\Generated\AgentRow>
+     * @throws \PSX\Sql\Exception\QueryException
+     */
+    public function findByTools(string $value, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\AgentColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->like('tools', $value);
+        return $this->doFindBy($condition, $startIndex, $count, $sortBy, $sortOrder);
+    }
+    /**
+     * @throws \PSX\Sql\Exception\QueryException
+     */
+    public function findOneByTools(string $value): ?\Fusio\Impl\Table\Generated\AgentRow
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->like('tools', $value);
+        return $this->doFindOneBy($condition);
+    }
+    /**
+     * @throws \PSX\Sql\Exception\ManipulationException
+     */
+    public function updateByTools(string $value, \Fusio\Impl\Table\Generated\AgentRow $record): int
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->like('tools', $value);
+        return $this->doUpdateBy($condition, $record->toRecord());
+    }
+    /**
+     * @throws \PSX\Sql\Exception\ManipulationException
+     */
+    public function deleteByTools(string $value): int
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->like('tools', $value);
+        return $this->doDeleteBy($condition);
+    }
+    /**
+     * @return array<\Fusio\Impl\Table\Generated\AgentRow>
+     * @throws \PSX\Sql\Exception\QueryException
+     */
+    public function findByOutgoing(string $value, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\AgentColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->like('outgoing', $value);
+        return $this->doFindBy($condition, $startIndex, $count, $sortBy, $sortOrder);
+    }
+    /**
+     * @throws \PSX\Sql\Exception\QueryException
+     */
+    public function findOneByOutgoing(string $value): ?\Fusio\Impl\Table\Generated\AgentRow
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->like('outgoing', $value);
+        return $this->doFindOneBy($condition);
+    }
+    /**
+     * @throws \PSX\Sql\Exception\ManipulationException
+     */
+    public function updateByOutgoing(string $value, \Fusio\Impl\Table\Generated\AgentRow $record): int
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->like('outgoing', $value);
+        return $this->doUpdateBy($condition, $record->toRecord());
+    }
+    /**
+     * @throws \PSX\Sql\Exception\ManipulationException
+     */
+    public function deleteByOutgoing(string $value): int
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->like('outgoing', $value);
+        return $this->doDeleteBy($condition);
+    }
+    /**
+     * @return array<\Fusio\Impl\Table\Generated\AgentRow>
+     * @throws \PSX\Sql\Exception\QueryException
+     */
+    public function findByAction(string $value, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\AgentColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->like('action', $value);
+        return $this->doFindBy($condition, $startIndex, $count, $sortBy, $sortOrder);
+    }
+    /**
+     * @throws \PSX\Sql\Exception\QueryException
+     */
+    public function findOneByAction(string $value): ?\Fusio\Impl\Table\Generated\AgentRow
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->like('action', $value);
+        return $this->doFindOneBy($condition);
+    }
+    /**
+     * @throws \PSX\Sql\Exception\ManipulationException
+     */
+    public function updateByAction(string $value, \Fusio\Impl\Table\Generated\AgentRow $record): int
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->like('action', $value);
+        return $this->doUpdateBy($condition, $record->toRecord());
+    }
+    /**
+     * @throws \PSX\Sql\Exception\ManipulationException
+     */
+    public function deleteByAction(string $value): int
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->like('action', $value);
+        return $this->doDeleteBy($condition);
+    }
+    /**
+     * @return array<\Fusio\Impl\Table\Generated\AgentRow>
+     * @throws \PSX\Sql\Exception\QueryException
+     */
+    public function findByMetadata(string $value, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\AgentColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->like('metadata', $value);
+        return $this->doFindBy($condition, $startIndex, $count, $sortBy, $sortOrder);
+    }
+    /**
+     * @throws \PSX\Sql\Exception\QueryException
+     */
+    public function findOneByMetadata(string $value): ?\Fusio\Impl\Table\Generated\AgentRow
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->like('metadata', $value);
+        return $this->doFindOneBy($condition);
+    }
+    /**
+     * @throws \PSX\Sql\Exception\ManipulationException
+     */
+    public function updateByMetadata(string $value, \Fusio\Impl\Table\Generated\AgentRow $record): int
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->like('metadata', $value);
+        return $this->doUpdateBy($condition, $record->toRecord());
+    }
+    /**
+     * @throws \PSX\Sql\Exception\ManipulationException
+     */
+    public function deleteByMetadata(string $value): int
+    {
+        $condition = \PSX\Sql\Condition::withAnd();
+        $condition->like('metadata', $value);
         return $this->doDeleteBy($condition);
     }
     /**
diff --git a/src/Table/Generated/CronjobColumn.php b/src/Table/Generated/CronjobColumn.php
index 53c767a06..789514b76 100644
--- a/src/Table/Generated/CronjobColumn.php
+++ b/src/Table/Generated/CronjobColumn.php
@@ -6,8 +6,8 @@ enum CronjobColumn : string implements \PSX\Sql\ColumnInterface
 {
     case ID = \Fusio\Impl\Table\Generated\CronjobTable::COLUMN_ID;
     case CATEGORY_ID = \Fusio\Impl\Table\Generated\CronjobTable::COLUMN_CATEGORY_ID;
-    case TENANT_ID = \Fusio\Impl\Table\Generated\CronjobTable::COLUMN_TENANT_ID;
     case TAXONOMY_ID = \Fusio\Impl\Table\Generated\CronjobTable::COLUMN_TAXONOMY_ID;
+    case TENANT_ID = \Fusio\Impl\Table\Generated\CronjobTable::COLUMN_TENANT_ID;
     case STATUS = \Fusio\Impl\Table\Generated\CronjobTable::COLUMN_STATUS;
     case NAME = \Fusio\Impl\Table\Generated\CronjobTable::COLUMN_NAME;
     case CRON = \Fusio\Impl\Table\Generated\CronjobTable::COLUMN_CRON;
diff --git a/src/Table/Generated/CronjobRow.php b/src/Table/Generated/CronjobRow.php
index ff4c7c1a9..55a2c2d3b 100644
--- a/src/Table/Generated/CronjobRow.php
+++ b/src/Table/Generated/CronjobRow.php
@@ -6,8 +6,8 @@ class CronjobRow implements \JsonSerializable, \PSX\Record\RecordableInterface
 {
     private ?int $id = null;
     private ?int $categoryId = null;
-    private ?string $tenantId = null;
     private ?int $taxonomyId = null;
+    private ?string $tenantId = null;
     private ?int $status = null;
     private ?string $name = null;
     private ?string $cron = null;
@@ -31,14 +31,6 @@ public function getCategoryId(): int
     {
         return $this->categoryId ?? throw new \PSX\Sql\Exception\NoValueAvailable('No value for required column "category_id" was provided');
     }
-    public function setTenantId(?string $tenantId): void
-    {
-        $this->tenantId = $tenantId;
-    }
-    public function getTenantId(): ?string
-    {
-        return $this->tenantId;
-    }
     public function setTaxonomyId(?int $taxonomyId): void
     {
         $this->taxonomyId = $taxonomyId;
@@ -47,6 +39,14 @@ public function getTaxonomyId(): ?int
     {
         return $this->taxonomyId;
     }
+    public function setTenantId(?string $tenantId): void
+    {
+        $this->tenantId = $tenantId;
+    }
+    public function getTenantId(): ?string
+    {
+        return $this->tenantId;
+    }
     public function setStatus(int $status): void
     {
         $this->status = $status;
@@ -109,8 +109,8 @@ public function toRecord(): \PSX\Record\RecordInterface
         $record = new \PSX\Record\Record();
         $record->put('id', $this->id);
         $record->put('category_id', $this->categoryId);
-        $record->put('tenant_id', $this->tenantId);
         $record->put('taxonomy_id', $this->taxonomyId);
+        $record->put('tenant_id', $this->tenantId);
         $record->put('status', $this->status);
         $record->put('name', $this->name);
         $record->put('cron', $this->cron);
@@ -129,8 +129,8 @@ public static function from(array|\ArrayAccess $data): self
         $row = new self();
         $row->id = isset($data['id']) && is_int($data['id']) ? $data['id'] : null;
         $row->categoryId = isset($data['category_id']) && is_int($data['category_id']) ? $data['category_id'] : null;
-        $row->tenantId = isset($data['tenant_id']) && is_string($data['tenant_id']) ? $data['tenant_id'] : null;
         $row->taxonomyId = isset($data['taxonomy_id']) && is_int($data['taxonomy_id']) ? $data['taxonomy_id'] : null;
+        $row->tenantId = isset($data['tenant_id']) && is_string($data['tenant_id']) ? $data['tenant_id'] : null;
         $row->status = isset($data['status']) && is_int($data['status']) ? $data['status'] : null;
         $row->name = isset($data['name']) && is_string($data['name']) ? $data['name'] : null;
         $row->cron = isset($data['cron']) && is_string($data['cron']) ? $data['cron'] : null;
diff --git a/src/Table/Generated/CronjobTable.php b/src/Table/Generated/CronjobTable.php
index f35bb4722..b1129375d 100644
--- a/src/Table/Generated/CronjobTable.php
+++ b/src/Table/Generated/CronjobTable.php
@@ -10,8 +10,8 @@ class CronjobTable extends \PSX\Sql\TableAbstract
     public const NAME = 'fusio_cronjob';
     public const COLUMN_ID = 'id';
     public const COLUMN_CATEGORY_ID = 'category_id';
-    public const COLUMN_TENANT_ID = 'tenant_id';
     public const COLUMN_TAXONOMY_ID = 'taxonomy_id';
+    public const COLUMN_TENANT_ID = 'tenant_id';
     public const COLUMN_STATUS = 'status';
     public const COLUMN_NAME = 'name';
     public const COLUMN_CRON = 'cron';
@@ -25,7 +25,7 @@ public function getName(): string
     }
     public function getColumns(): array
     {
-        return [self::COLUMN_ID => 0x3020000a, self::COLUMN_CATEGORY_ID => 0x20000a, self::COLUMN_TENANT_ID => 0x40a00040, self::COLUMN_TAXONOMY_ID => 0x4020000a, self::COLUMN_STATUS => 0x20000a, self::COLUMN_NAME => 0xa00040, self::COLUMN_CRON => 0xa000ff, self::COLUMN_ACTION => 0x40a000ff, self::COLUMN_EXECUTE_DATE => 0x40800000, self::COLUMN_EXIT_CODE => 0x4020000a, self::COLUMN_METADATA => 0x40b00000];
+        return [self::COLUMN_ID => 0x3020000a, self::COLUMN_CATEGORY_ID => 0x20000a, self::COLUMN_TAXONOMY_ID => 0x4020000a, self::COLUMN_TENANT_ID => 0x40a00040, self::COLUMN_STATUS => 0x20000a, self::COLUMN_NAME => 0xa00040, self::COLUMN_CRON => 0xa000ff, self::COLUMN_ACTION => 0x40a000ff, self::COLUMN_EXECUTE_DATE => 0x40800000, self::COLUMN_EXIT_CODE => 0x4020000a, self::COLUMN_METADATA => 0x40b00000];
     }
     /**
      * @return array<\Fusio\Impl\Table\Generated\CronjobRow>
@@ -137,74 +137,74 @@ public function deleteByCategoryId(int $value): int
      * @return array<\Fusio\Impl\Table\Generated\CronjobRow>
      * @throws \PSX\Sql\Exception\QueryException
      */
-    public function findByTenantId(string $value, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\CronjobColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
+    public function findByTaxonomyId(int $value, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\CronjobColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->like('tenant_id', $value);
+        $condition->equals('taxonomy_id', $value);
         return $this->doFindBy($condition, $startIndex, $count, $sortBy, $sortOrder);
     }
     /**
      * @throws \PSX\Sql\Exception\QueryException
      */
-    public function findOneByTenantId(string $value): ?\Fusio\Impl\Table\Generated\CronjobRow
+    public function findOneByTaxonomyId(int $value): ?\Fusio\Impl\Table\Generated\CronjobRow
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->like('tenant_id', $value);
+        $condition->equals('taxonomy_id', $value);
         return $this->doFindOneBy($condition);
     }
     /**
      * @throws \PSX\Sql\Exception\ManipulationException
      */
-    public function updateByTenantId(string $value, \Fusio\Impl\Table\Generated\CronjobRow $record): int
+    public function updateByTaxonomyId(int $value, \Fusio\Impl\Table\Generated\CronjobRow $record): int
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->like('tenant_id', $value);
+        $condition->equals('taxonomy_id', $value);
         return $this->doUpdateBy($condition, $record->toRecord());
     }
     /**
      * @throws \PSX\Sql\Exception\ManipulationException
      */
-    public function deleteByTenantId(string $value): int
+    public function deleteByTaxonomyId(int $value): int
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->like('tenant_id', $value);
+        $condition->equals('taxonomy_id', $value);
         return $this->doDeleteBy($condition);
     }
     /**
      * @return array<\Fusio\Impl\Table\Generated\CronjobRow>
      * @throws \PSX\Sql\Exception\QueryException
      */
-    public function findByTaxonomyId(int $value, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\CronjobColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
+    public function findByTenantId(string $value, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\CronjobColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->equals('taxonomy_id', $value);
+        $condition->like('tenant_id', $value);
         return $this->doFindBy($condition, $startIndex, $count, $sortBy, $sortOrder);
     }
     /**
      * @throws \PSX\Sql\Exception\QueryException
      */
-    public function findOneByTaxonomyId(int $value): ?\Fusio\Impl\Table\Generated\CronjobRow
+    public function findOneByTenantId(string $value): ?\Fusio\Impl\Table\Generated\CronjobRow
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->equals('taxonomy_id', $value);
+        $condition->like('tenant_id', $value);
         return $this->doFindOneBy($condition);
     }
     /**
      * @throws \PSX\Sql\Exception\ManipulationException
      */
-    public function updateByTaxonomyId(int $value, \Fusio\Impl\Table\Generated\CronjobRow $record): int
+    public function updateByTenantId(string $value, \Fusio\Impl\Table\Generated\CronjobRow $record): int
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->equals('taxonomy_id', $value);
+        $condition->like('tenant_id', $value);
         return $this->doUpdateBy($condition, $record->toRecord());
     }
     /**
      * @throws \PSX\Sql\Exception\ManipulationException
      */
-    public function deleteByTaxonomyId(int $value): int
+    public function deleteByTenantId(string $value): int
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->equals('taxonomy_id', $value);
+        $condition->like('tenant_id', $value);
         return $this->doDeleteBy($condition);
     }
     /**
diff --git a/src/Table/Generated/EventColumn.php b/src/Table/Generated/EventColumn.php
index 88fc742a8..c308ac93b 100644
--- a/src/Table/Generated/EventColumn.php
+++ b/src/Table/Generated/EventColumn.php
@@ -6,8 +6,8 @@ enum EventColumn : string implements \PSX\Sql\ColumnInterface
 {
     case ID = \Fusio\Impl\Table\Generated\EventTable::COLUMN_ID;
     case CATEGORY_ID = \Fusio\Impl\Table\Generated\EventTable::COLUMN_CATEGORY_ID;
-    case TENANT_ID = \Fusio\Impl\Table\Generated\EventTable::COLUMN_TENANT_ID;
     case TAXONOMY_ID = \Fusio\Impl\Table\Generated\EventTable::COLUMN_TAXONOMY_ID;
+    case TENANT_ID = \Fusio\Impl\Table\Generated\EventTable::COLUMN_TENANT_ID;
     case STATUS = \Fusio\Impl\Table\Generated\EventTable::COLUMN_STATUS;
     case NAME = \Fusio\Impl\Table\Generated\EventTable::COLUMN_NAME;
     case DESCRIPTION = \Fusio\Impl\Table\Generated\EventTable::COLUMN_DESCRIPTION;
diff --git a/src/Table/Generated/EventRow.php b/src/Table/Generated/EventRow.php
index 7da899e94..77179487c 100644
--- a/src/Table/Generated/EventRow.php
+++ b/src/Table/Generated/EventRow.php
@@ -6,8 +6,8 @@ class EventRow implements \JsonSerializable, \PSX\Record\RecordableInterface
 {
     private ?int $id = null;
     private ?int $categoryId = null;
-    private ?string $tenantId = null;
     private ?int $taxonomyId = null;
+    private ?string $tenantId = null;
     private ?int $status = null;
     private ?string $name = null;
     private ?string $description = null;
@@ -29,14 +29,6 @@ public function getCategoryId(): int
     {
         return $this->categoryId ?? throw new \PSX\Sql\Exception\NoValueAvailable('No value for required column "category_id" was provided');
     }
-    public function setTenantId(?string $tenantId): void
-    {
-        $this->tenantId = $tenantId;
-    }
-    public function getTenantId(): ?string
-    {
-        return $this->tenantId;
-    }
     public function setTaxonomyId(?int $taxonomyId): void
     {
         $this->taxonomyId = $taxonomyId;
@@ -45,6 +37,14 @@ public function getTaxonomyId(): ?int
     {
         return $this->taxonomyId;
     }
+    public function setTenantId(?string $tenantId): void
+    {
+        $this->tenantId = $tenantId;
+    }
+    public function getTenantId(): ?string
+    {
+        return $this->tenantId;
+    }
     public function setStatus(int $status): void
     {
         $this->status = $status;
@@ -91,8 +91,8 @@ public function toRecord(): \PSX\Record\RecordInterface
         $record = new \PSX\Record\Record();
         $record->put('id', $this->id);
         $record->put('category_id', $this->categoryId);
-        $record->put('tenant_id', $this->tenantId);
         $record->put('taxonomy_id', $this->taxonomyId);
+        $record->put('tenant_id', $this->tenantId);
         $record->put('status', $this->status);
         $record->put('name', $this->name);
         $record->put('description', $this->description);
@@ -109,8 +109,8 @@ public static function from(array|\ArrayAccess $data): self
         $row = new self();
         $row->id = isset($data['id']) && is_int($data['id']) ? $data['id'] : null;
         $row->categoryId = isset($data['category_id']) && is_int($data['category_id']) ? $data['category_id'] : null;
-        $row->tenantId = isset($data['tenant_id']) && is_string($data['tenant_id']) ? $data['tenant_id'] : null;
         $row->taxonomyId = isset($data['taxonomy_id']) && is_int($data['taxonomy_id']) ? $data['taxonomy_id'] : null;
+        $row->tenantId = isset($data['tenant_id']) && is_string($data['tenant_id']) ? $data['tenant_id'] : null;
         $row->status = isset($data['status']) && is_int($data['status']) ? $data['status'] : null;
         $row->name = isset($data['name']) && is_string($data['name']) ? $data['name'] : null;
         $row->description = isset($data['description']) && is_string($data['description']) ? $data['description'] : null;
diff --git a/src/Table/Generated/EventTable.php b/src/Table/Generated/EventTable.php
index 6d0ce0355..1f8e59553 100644
--- a/src/Table/Generated/EventTable.php
+++ b/src/Table/Generated/EventTable.php
@@ -10,8 +10,8 @@ class EventTable extends \PSX\Sql\TableAbstract
     public const NAME = 'fusio_event';
     public const COLUMN_ID = 'id';
     public const COLUMN_CATEGORY_ID = 'category_id';
-    public const COLUMN_TENANT_ID = 'tenant_id';
     public const COLUMN_TAXONOMY_ID = 'taxonomy_id';
+    public const COLUMN_TENANT_ID = 'tenant_id';
     public const COLUMN_STATUS = 'status';
     public const COLUMN_NAME = 'name';
     public const COLUMN_DESCRIPTION = 'description';
@@ -23,7 +23,7 @@ public function getName(): string
     }
     public function getColumns(): array
     {
-        return [self::COLUMN_ID => 0x3020000a, self::COLUMN_CATEGORY_ID => 0x20000a, self::COLUMN_TENANT_ID => 0x40a00040, self::COLUMN_TAXONOMY_ID => 0x4020000a, self::COLUMN_STATUS => 0x20000a, self::COLUMN_NAME => 0xa00040, self::COLUMN_DESCRIPTION => 0xa000ff, self::COLUMN_EVENT_SCHEMA => 0x40a000ff, self::COLUMN_METADATA => 0x40b00000];
+        return [self::COLUMN_ID => 0x3020000a, self::COLUMN_CATEGORY_ID => 0x20000a, self::COLUMN_TAXONOMY_ID => 0x4020000a, self::COLUMN_TENANT_ID => 0x40a00040, self::COLUMN_STATUS => 0x20000a, self::COLUMN_NAME => 0xa00040, self::COLUMN_DESCRIPTION => 0xa000ff, self::COLUMN_EVENT_SCHEMA => 0x40a000ff, self::COLUMN_METADATA => 0x40b00000];
     }
     /**
      * @return array<\Fusio\Impl\Table\Generated\EventRow>
@@ -135,74 +135,74 @@ public function deleteByCategoryId(int $value): int
      * @return array<\Fusio\Impl\Table\Generated\EventRow>
      * @throws \PSX\Sql\Exception\QueryException
      */
-    public function findByTenantId(string $value, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\EventColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
+    public function findByTaxonomyId(int $value, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\EventColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->like('tenant_id', $value);
+        $condition->equals('taxonomy_id', $value);
         return $this->doFindBy($condition, $startIndex, $count, $sortBy, $sortOrder);
     }
     /**
      * @throws \PSX\Sql\Exception\QueryException
      */
-    public function findOneByTenantId(string $value): ?\Fusio\Impl\Table\Generated\EventRow
+    public function findOneByTaxonomyId(int $value): ?\Fusio\Impl\Table\Generated\EventRow
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->like('tenant_id', $value);
+        $condition->equals('taxonomy_id', $value);
         return $this->doFindOneBy($condition);
     }
     /**
      * @throws \PSX\Sql\Exception\ManipulationException
      */
-    public function updateByTenantId(string $value, \Fusio\Impl\Table\Generated\EventRow $record): int
+    public function updateByTaxonomyId(int $value, \Fusio\Impl\Table\Generated\EventRow $record): int
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->like('tenant_id', $value);
+        $condition->equals('taxonomy_id', $value);
         return $this->doUpdateBy($condition, $record->toRecord());
     }
     /**
      * @throws \PSX\Sql\Exception\ManipulationException
      */
-    public function deleteByTenantId(string $value): int
+    public function deleteByTaxonomyId(int $value): int
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->like('tenant_id', $value);
+        $condition->equals('taxonomy_id', $value);
         return $this->doDeleteBy($condition);
     }
     /**
      * @return array<\Fusio\Impl\Table\Generated\EventRow>
      * @throws \PSX\Sql\Exception\QueryException
      */
-    public function findByTaxonomyId(int $value, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\EventColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
+    public function findByTenantId(string $value, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\EventColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->equals('taxonomy_id', $value);
+        $condition->like('tenant_id', $value);
         return $this->doFindBy($condition, $startIndex, $count, $sortBy, $sortOrder);
     }
     /**
      * @throws \PSX\Sql\Exception\QueryException
      */
-    public function findOneByTaxonomyId(int $value): ?\Fusio\Impl\Table\Generated\EventRow
+    public function findOneByTenantId(string $value): ?\Fusio\Impl\Table\Generated\EventRow
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->equals('taxonomy_id', $value);
+        $condition->like('tenant_id', $value);
         return $this->doFindOneBy($condition);
     }
     /**
      * @throws \PSX\Sql\Exception\ManipulationException
      */
-    public function updateByTaxonomyId(int $value, \Fusio\Impl\Table\Generated\EventRow $record): int
+    public function updateByTenantId(string $value, \Fusio\Impl\Table\Generated\EventRow $record): int
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->equals('taxonomy_id', $value);
+        $condition->like('tenant_id', $value);
         return $this->doUpdateBy($condition, $record->toRecord());
     }
     /**
      * @throws \PSX\Sql\Exception\ManipulationException
      */
-    public function deleteByTaxonomyId(int $value): int
+    public function deleteByTenantId(string $value): int
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->equals('taxonomy_id', $value);
+        $condition->like('tenant_id', $value);
         return $this->doDeleteBy($condition);
     }
     /**
diff --git a/src/Table/Generated/OperationColumn.php b/src/Table/Generated/OperationColumn.php
index 921d8da25..4d55670a6 100644
--- a/src/Table/Generated/OperationColumn.php
+++ b/src/Table/Generated/OperationColumn.php
@@ -6,8 +6,8 @@ enum OperationColumn : string implements \PSX\Sql\ColumnInterface
 {
     case ID = \Fusio\Impl\Table\Generated\OperationTable::COLUMN_ID;
     case CATEGORY_ID = \Fusio\Impl\Table\Generated\OperationTable::COLUMN_CATEGORY_ID;
-    case TENANT_ID = \Fusio\Impl\Table\Generated\OperationTable::COLUMN_TENANT_ID;
     case TAXONOMY_ID = \Fusio\Impl\Table\Generated\OperationTable::COLUMN_TAXONOMY_ID;
+    case TENANT_ID = \Fusio\Impl\Table\Generated\OperationTable::COLUMN_TENANT_ID;
     case STATUS = \Fusio\Impl\Table\Generated\OperationTable::COLUMN_STATUS;
     case ACTIVE = \Fusio\Impl\Table\Generated\OperationTable::COLUMN_ACTIVE;
     case PUBLIC = \Fusio\Impl\Table\Generated\OperationTable::COLUMN_PUBLIC;
diff --git a/src/Table/Generated/OperationRow.php b/src/Table/Generated/OperationRow.php
index 77e8c20f5..ad84ea473 100644
--- a/src/Table/Generated/OperationRow.php
+++ b/src/Table/Generated/OperationRow.php
@@ -6,8 +6,8 @@ class OperationRow implements \JsonSerializable, \PSX\Record\RecordableInterface
 {
     private ?int $id = null;
     private ?int $categoryId = null;
-    private ?string $tenantId = null;
     private ?int $taxonomyId = null;
+    private ?string $tenantId = null;
     private ?int $status = null;
     private ?int $active = null;
     private ?int $public = null;
@@ -40,14 +40,6 @@ public function getCategoryId(): int
     {
         return $this->categoryId ?? throw new \PSX\Sql\Exception\NoValueAvailable('No value for required column "category_id" was provided');
     }
-    public function setTenantId(?string $tenantId): void
-    {
-        $this->tenantId = $tenantId;
-    }
-    public function getTenantId(): ?string
-    {
-        return $this->tenantId;
-    }
     public function setTaxonomyId(?int $taxonomyId): void
     {
         $this->taxonomyId = $taxonomyId;
@@ -56,6 +48,14 @@ public function getTaxonomyId(): ?int
     {
         return $this->taxonomyId;
     }
+    public function setTenantId(?string $tenantId): void
+    {
+        $this->tenantId = $tenantId;
+    }
+    public function getTenantId(): ?string
+    {
+        return $this->tenantId;
+    }
     public function setStatus(int $status): void
     {
         $this->status = $status;
@@ -190,8 +190,8 @@ public function toRecord(): \PSX\Record\RecordInterface
         $record = new \PSX\Record\Record();
         $record->put('id', $this->id);
         $record->put('category_id', $this->categoryId);
-        $record->put('tenant_id', $this->tenantId);
         $record->put('taxonomy_id', $this->taxonomyId);
+        $record->put('tenant_id', $this->tenantId);
         $record->put('status', $this->status);
         $record->put('active', $this->active);
         $record->put('public', $this->public);
@@ -219,8 +219,8 @@ public static function from(array|\ArrayAccess $data): self
         $row = new self();
         $row->id = isset($data['id']) && is_int($data['id']) ? $data['id'] : null;
         $row->categoryId = isset($data['category_id']) && is_int($data['category_id']) ? $data['category_id'] : null;
-        $row->tenantId = isset($data['tenant_id']) && is_string($data['tenant_id']) ? $data['tenant_id'] : null;
         $row->taxonomyId = isset($data['taxonomy_id']) && is_int($data['taxonomy_id']) ? $data['taxonomy_id'] : null;
+        $row->tenantId = isset($data['tenant_id']) && is_string($data['tenant_id']) ? $data['tenant_id'] : null;
         $row->status = isset($data['status']) && is_int($data['status']) ? $data['status'] : null;
         $row->active = isset($data['active']) && is_int($data['active']) ? $data['active'] : null;
         $row->public = isset($data['public']) && is_int($data['public']) ? $data['public'] : null;
diff --git a/src/Table/Generated/OperationTable.php b/src/Table/Generated/OperationTable.php
index b691a9a3d..3a7e64252 100644
--- a/src/Table/Generated/OperationTable.php
+++ b/src/Table/Generated/OperationTable.php
@@ -10,8 +10,8 @@ class OperationTable extends \PSX\Sql\TableAbstract
     public const NAME = 'fusio_operation';
     public const COLUMN_ID = 'id';
     public const COLUMN_CATEGORY_ID = 'category_id';
-    public const COLUMN_TENANT_ID = 'tenant_id';
     public const COLUMN_TAXONOMY_ID = 'taxonomy_id';
+    public const COLUMN_TENANT_ID = 'tenant_id';
     public const COLUMN_STATUS = 'status';
     public const COLUMN_ACTIVE = 'active';
     public const COLUMN_PUBLIC = 'public';
@@ -34,7 +34,7 @@ public function getName(): string
     }
     public function getColumns(): array
     {
-        return [self::COLUMN_ID => 0x3020000a, self::COLUMN_CATEGORY_ID => 0x20000a, self::COLUMN_TENANT_ID => 0x40a00040, self::COLUMN_TAXONOMY_ID => 0x4020000a, self::COLUMN_STATUS => 0x20000a, self::COLUMN_ACTIVE => 0x20000a, self::COLUMN_PUBLIC => 0x20000a, self::COLUMN_STABILITY => 0x20000a, self::COLUMN_DESCRIPTION => 0x40a001f4, self::COLUMN_HTTP_METHOD => 0xa00010, self::COLUMN_HTTP_PATH => 0xa000ff, self::COLUMN_HTTP_CODE => 0x20000a, self::COLUMN_NAME => 0xa000ff, self::COLUMN_PARAMETERS => 0x40b00000, self::COLUMN_INCOMING => 0x40a000ff, self::COLUMN_OUTGOING => 0xa000ff, self::COLUMN_THROWS => 0x40b00000, self::COLUMN_ACTION => 0xa000ff, self::COLUMN_COSTS => 0x4020000a, self::COLUMN_METADATA => 0x40b00000];
+        return [self::COLUMN_ID => 0x3020000a, self::COLUMN_CATEGORY_ID => 0x20000a, self::COLUMN_TAXONOMY_ID => 0x4020000a, self::COLUMN_TENANT_ID => 0x40a00040, self::COLUMN_STATUS => 0x20000a, self::COLUMN_ACTIVE => 0x20000a, self::COLUMN_PUBLIC => 0x20000a, self::COLUMN_STABILITY => 0x20000a, self::COLUMN_DESCRIPTION => 0x40a001f4, self::COLUMN_HTTP_METHOD => 0xa00010, self::COLUMN_HTTP_PATH => 0xa000ff, self::COLUMN_HTTP_CODE => 0x20000a, self::COLUMN_NAME => 0xa000ff, self::COLUMN_PARAMETERS => 0x40b00000, self::COLUMN_INCOMING => 0x40a000ff, self::COLUMN_OUTGOING => 0xa000ff, self::COLUMN_THROWS => 0x40b00000, self::COLUMN_ACTION => 0xa000ff, self::COLUMN_COSTS => 0x4020000a, self::COLUMN_METADATA => 0x40b00000];
     }
     /**
      * @return array<\Fusio\Impl\Table\Generated\OperationRow>
@@ -146,74 +146,74 @@ public function deleteByCategoryId(int $value): int
      * @return array<\Fusio\Impl\Table\Generated\OperationRow>
      * @throws \PSX\Sql\Exception\QueryException
      */
-    public function findByTenantId(string $value, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\OperationColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
+    public function findByTaxonomyId(int $value, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\OperationColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->like('tenant_id', $value);
+        $condition->equals('taxonomy_id', $value);
         return $this->doFindBy($condition, $startIndex, $count, $sortBy, $sortOrder);
     }
     /**
      * @throws \PSX\Sql\Exception\QueryException
      */
-    public function findOneByTenantId(string $value): ?\Fusio\Impl\Table\Generated\OperationRow
+    public function findOneByTaxonomyId(int $value): ?\Fusio\Impl\Table\Generated\OperationRow
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->like('tenant_id', $value);
+        $condition->equals('taxonomy_id', $value);
         return $this->doFindOneBy($condition);
     }
     /**
      * @throws \PSX\Sql\Exception\ManipulationException
      */
-    public function updateByTenantId(string $value, \Fusio\Impl\Table\Generated\OperationRow $record): int
+    public function updateByTaxonomyId(int $value, \Fusio\Impl\Table\Generated\OperationRow $record): int
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->like('tenant_id', $value);
+        $condition->equals('taxonomy_id', $value);
         return $this->doUpdateBy($condition, $record->toRecord());
     }
     /**
      * @throws \PSX\Sql\Exception\ManipulationException
      */
-    public function deleteByTenantId(string $value): int
+    public function deleteByTaxonomyId(int $value): int
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->like('tenant_id', $value);
+        $condition->equals('taxonomy_id', $value);
         return $this->doDeleteBy($condition);
     }
     /**
      * @return array<\Fusio\Impl\Table\Generated\OperationRow>
      * @throws \PSX\Sql\Exception\QueryException
      */
-    public function findByTaxonomyId(int $value, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\OperationColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
+    public function findByTenantId(string $value, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\OperationColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->equals('taxonomy_id', $value);
+        $condition->like('tenant_id', $value);
         return $this->doFindBy($condition, $startIndex, $count, $sortBy, $sortOrder);
     }
     /**
      * @throws \PSX\Sql\Exception\QueryException
      */
-    public function findOneByTaxonomyId(int $value): ?\Fusio\Impl\Table\Generated\OperationRow
+    public function findOneByTenantId(string $value): ?\Fusio\Impl\Table\Generated\OperationRow
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->equals('taxonomy_id', $value);
+        $condition->like('tenant_id', $value);
         return $this->doFindOneBy($condition);
     }
     /**
      * @throws \PSX\Sql\Exception\ManipulationException
      */
-    public function updateByTaxonomyId(int $value, \Fusio\Impl\Table\Generated\OperationRow $record): int
+    public function updateByTenantId(string $value, \Fusio\Impl\Table\Generated\OperationRow $record): int
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->equals('taxonomy_id', $value);
+        $condition->like('tenant_id', $value);
         return $this->doUpdateBy($condition, $record->toRecord());
     }
     /**
      * @throws \PSX\Sql\Exception\ManipulationException
      */
-    public function deleteByTaxonomyId(int $value): int
+    public function deleteByTenantId(string $value): int
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->equals('taxonomy_id', $value);
+        $condition->like('tenant_id', $value);
         return $this->doDeleteBy($condition);
     }
     /**
diff --git a/src/Table/Generated/TriggerColumn.php b/src/Table/Generated/TriggerColumn.php
index 26573f486..a7e7f3a8c 100644
--- a/src/Table/Generated/TriggerColumn.php
+++ b/src/Table/Generated/TriggerColumn.php
@@ -5,9 +5,9 @@
 enum TriggerColumn : string implements \PSX\Sql\ColumnInterface
 {
     case ID = \Fusio\Impl\Table\Generated\TriggerTable::COLUMN_ID;
-    case TENANT_ID = \Fusio\Impl\Table\Generated\TriggerTable::COLUMN_TENANT_ID;
     case CATEGORY_ID = \Fusio\Impl\Table\Generated\TriggerTable::COLUMN_CATEGORY_ID;
     case TAXONOMY_ID = \Fusio\Impl\Table\Generated\TriggerTable::COLUMN_TAXONOMY_ID;
+    case TENANT_ID = \Fusio\Impl\Table\Generated\TriggerTable::COLUMN_TENANT_ID;
     case STATUS = \Fusio\Impl\Table\Generated\TriggerTable::COLUMN_STATUS;
     case NAME = \Fusio\Impl\Table\Generated\TriggerTable::COLUMN_NAME;
     case EVENT = \Fusio\Impl\Table\Generated\TriggerTable::COLUMN_EVENT;
diff --git a/src/Table/Generated/TriggerRow.php b/src/Table/Generated/TriggerRow.php
index 7fcb3c8f7..75e2cb3b7 100644
--- a/src/Table/Generated/TriggerRow.php
+++ b/src/Table/Generated/TriggerRow.php
@@ -5,9 +5,9 @@
 class TriggerRow implements \JsonSerializable, \PSX\Record\RecordableInterface
 {
     private ?int $id = null;
-    private ?string $tenantId = null;
     private ?int $categoryId = null;
     private ?int $taxonomyId = null;
+    private ?string $tenantId = null;
     private ?int $status = null;
     private ?string $name = null;
     private ?string $event = null;
@@ -21,14 +21,6 @@ public function getId(): int
     {
         return $this->id ?? throw new \PSX\Sql\Exception\NoValueAvailable('No value for required column "id" was provided');
     }
-    public function setTenantId(?string $tenantId): void
-    {
-        $this->tenantId = $tenantId;
-    }
-    public function getTenantId(): ?string
-    {
-        return $this->tenantId;
-    }
     public function setCategoryId(int $categoryId): void
     {
         $this->categoryId = $categoryId;
@@ -45,6 +37,14 @@ public function getTaxonomyId(): ?int
     {
         return $this->taxonomyId;
     }
+    public function setTenantId(?string $tenantId): void
+    {
+        $this->tenantId = $tenantId;
+    }
+    public function getTenantId(): ?string
+    {
+        return $this->tenantId;
+    }
     public function setStatus(int $status): void
     {
         $this->status = $status;
@@ -90,9 +90,9 @@ public function toRecord(): \PSX\Record\RecordInterface
         /** @var \PSX\Record\Record<mixed> $record */
         $record = new \PSX\Record\Record();
         $record->put('id', $this->id);
-        $record->put('tenant_id', $this->tenantId);
         $record->put('category_id', $this->categoryId);
         $record->put('taxonomy_id', $this->taxonomyId);
+        $record->put('tenant_id', $this->tenantId);
         $record->put('status', $this->status);
         $record->put('name', $this->name);
         $record->put('event', $this->event);
@@ -108,9 +108,9 @@ public static function from(array|\ArrayAccess $data): self
     {
         $row = new self();
         $row->id = isset($data['id']) && is_int($data['id']) ? $data['id'] : null;
-        $row->tenantId = isset($data['tenant_id']) && is_string($data['tenant_id']) ? $data['tenant_id'] : null;
         $row->categoryId = isset($data['category_id']) && is_int($data['category_id']) ? $data['category_id'] : null;
         $row->taxonomyId = isset($data['taxonomy_id']) && is_int($data['taxonomy_id']) ? $data['taxonomy_id'] : null;
+        $row->tenantId = isset($data['tenant_id']) && is_string($data['tenant_id']) ? $data['tenant_id'] : null;
         $row->status = isset($data['status']) && is_int($data['status']) ? $data['status'] : null;
         $row->name = isset($data['name']) && is_string($data['name']) ? $data['name'] : null;
         $row->event = isset($data['event']) && is_string($data['event']) ? $data['event'] : null;
diff --git a/src/Table/Generated/TriggerTable.php b/src/Table/Generated/TriggerTable.php
index 672e2869c..382c188fd 100644
--- a/src/Table/Generated/TriggerTable.php
+++ b/src/Table/Generated/TriggerTable.php
@@ -9,9 +9,9 @@ class TriggerTable extends \PSX\Sql\TableAbstract
 {
     public const NAME = 'fusio_trigger';
     public const COLUMN_ID = 'id';
-    public const COLUMN_TENANT_ID = 'tenant_id';
     public const COLUMN_CATEGORY_ID = 'category_id';
     public const COLUMN_TAXONOMY_ID = 'taxonomy_id';
+    public const COLUMN_TENANT_ID = 'tenant_id';
     public const COLUMN_STATUS = 'status';
     public const COLUMN_NAME = 'name';
     public const COLUMN_EVENT = 'event';
@@ -23,7 +23,7 @@ public function getName(): string
     }
     public function getColumns(): array
     {
-        return [self::COLUMN_ID => 0x3020000a, self::COLUMN_TENANT_ID => 0x40a00040, self::COLUMN_CATEGORY_ID => 0x20000a, self::COLUMN_TAXONOMY_ID => 0x4020000a, self::COLUMN_STATUS => 0x20000a, self::COLUMN_NAME => 0xa000ff, self::COLUMN_EVENT => 0xa00040, self::COLUMN_ACTION => 0xa000ff, self::COLUMN_METADATA => 0x40b00000];
+        return [self::COLUMN_ID => 0x3020000a, self::COLUMN_CATEGORY_ID => 0x20000a, self::COLUMN_TAXONOMY_ID => 0x4020000a, self::COLUMN_TENANT_ID => 0x40a00040, self::COLUMN_STATUS => 0x20000a, self::COLUMN_NAME => 0xa000ff, self::COLUMN_EVENT => 0xa00040, self::COLUMN_ACTION => 0xa000ff, self::COLUMN_METADATA => 0x40b00000];
     }
     /**
      * @return array<\Fusio\Impl\Table\Generated\TriggerRow>
@@ -98,111 +98,111 @@ public function deleteById(int $value): int
      * @return array<\Fusio\Impl\Table\Generated\TriggerRow>
      * @throws \PSX\Sql\Exception\QueryException
      */
-    public function findByTenantId(string $value, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\TriggerColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
+    public function findByCategoryId(int $value, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\TriggerColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->like('tenant_id', $value);
+        $condition->equals('category_id', $value);
         return $this->doFindBy($condition, $startIndex, $count, $sortBy, $sortOrder);
     }
     /**
      * @throws \PSX\Sql\Exception\QueryException
      */
-    public function findOneByTenantId(string $value): ?\Fusio\Impl\Table\Generated\TriggerRow
+    public function findOneByCategoryId(int $value): ?\Fusio\Impl\Table\Generated\TriggerRow
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->like('tenant_id', $value);
+        $condition->equals('category_id', $value);
         return $this->doFindOneBy($condition);
     }
     /**
      * @throws \PSX\Sql\Exception\ManipulationException
      */
-    public function updateByTenantId(string $value, \Fusio\Impl\Table\Generated\TriggerRow $record): int
+    public function updateByCategoryId(int $value, \Fusio\Impl\Table\Generated\TriggerRow $record): int
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->like('tenant_id', $value);
+        $condition->equals('category_id', $value);
         return $this->doUpdateBy($condition, $record->toRecord());
     }
     /**
      * @throws \PSX\Sql\Exception\ManipulationException
      */
-    public function deleteByTenantId(string $value): int
+    public function deleteByCategoryId(int $value): int
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->like('tenant_id', $value);
+        $condition->equals('category_id', $value);
         return $this->doDeleteBy($condition);
     }
     /**
      * @return array<\Fusio\Impl\Table\Generated\TriggerRow>
      * @throws \PSX\Sql\Exception\QueryException
      */
-    public function findByCategoryId(int $value, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\TriggerColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
+    public function findByTaxonomyId(int $value, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\TriggerColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->equals('category_id', $value);
+        $condition->equals('taxonomy_id', $value);
         return $this->doFindBy($condition, $startIndex, $count, $sortBy, $sortOrder);
     }
     /**
      * @throws \PSX\Sql\Exception\QueryException
      */
-    public function findOneByCategoryId(int $value): ?\Fusio\Impl\Table\Generated\TriggerRow
+    public function findOneByTaxonomyId(int $value): ?\Fusio\Impl\Table\Generated\TriggerRow
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->equals('category_id', $value);
+        $condition->equals('taxonomy_id', $value);
         return $this->doFindOneBy($condition);
     }
     /**
      * @throws \PSX\Sql\Exception\ManipulationException
      */
-    public function updateByCategoryId(int $value, \Fusio\Impl\Table\Generated\TriggerRow $record): int
+    public function updateByTaxonomyId(int $value, \Fusio\Impl\Table\Generated\TriggerRow $record): int
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->equals('category_id', $value);
+        $condition->equals('taxonomy_id', $value);
         return $this->doUpdateBy($condition, $record->toRecord());
     }
     /**
      * @throws \PSX\Sql\Exception\ManipulationException
      */
-    public function deleteByCategoryId(int $value): int
+    public function deleteByTaxonomyId(int $value): int
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->equals('category_id', $value);
+        $condition->equals('taxonomy_id', $value);
         return $this->doDeleteBy($condition);
     }
     /**
      * @return array<\Fusio\Impl\Table\Generated\TriggerRow>
      * @throws \PSX\Sql\Exception\QueryException
      */
-    public function findByTaxonomyId(int $value, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\TriggerColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
+    public function findByTenantId(string $value, ?int $startIndex = null, ?int $count = null, ?\Fusio\Impl\Table\Generated\TriggerColumn $sortBy = null, ?\PSX\Sql\OrderBy $sortOrder = null): array
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->equals('taxonomy_id', $value);
+        $condition->like('tenant_id', $value);
         return $this->doFindBy($condition, $startIndex, $count, $sortBy, $sortOrder);
     }
     /**
      * @throws \PSX\Sql\Exception\QueryException
      */
-    public function findOneByTaxonomyId(int $value): ?\Fusio\Impl\Table\Generated\TriggerRow
+    public function findOneByTenantId(string $value): ?\Fusio\Impl\Table\Generated\TriggerRow
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->equals('taxonomy_id', $value);
+        $condition->like('tenant_id', $value);
         return $this->doFindOneBy($condition);
     }
     /**
      * @throws \PSX\Sql\Exception\ManipulationException
      */
-    public function updateByTaxonomyId(int $value, \Fusio\Impl\Table\Generated\TriggerRow $record): int
+    public function updateByTenantId(string $value, \Fusio\Impl\Table\Generated\TriggerRow $record): int
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->equals('taxonomy_id', $value);
+        $condition->like('tenant_id', $value);
         return $this->doUpdateBy($condition, $record->toRecord());
     }
     /**
      * @throws \PSX\Sql\Exception\ManipulationException
      */
-    public function deleteByTaxonomyId(int $value): int
+    public function deleteByTenantId(string $value): int
     {
         $condition = \PSX\Sql\Condition::withAnd();
-        $condition->equals('taxonomy_id', $value);
+        $condition->like('tenant_id', $value);
         return $this->doDeleteBy($condition);
     }
     /**
diff --git a/src/Tenant/UnlimitedLimiter.php b/src/Tenant/UnlimitedLimiter.php
index a07d84d61..49efbebfb 100644
--- a/src/Tenant/UnlimitedLimiter.php
+++ b/src/Tenant/UnlimitedLimiter.php
@@ -36,6 +36,11 @@ public function getActionCount(): int
         return PHP_INT_MAX;
     }
 
+    public function getAgentCount(): int
+    {
+        return PHP_INT_MAX;
+    }
+
     public function getAppCount(): int
     {
         return PHP_INT_MAX;
diff --git a/tests/Adapter/Test/AgentConnection.php b/tests/Adapter/Test/AgentConnection.php
new file mode 100644
index 000000000..ca3f9d630
--- /dev/null
+++ b/tests/Adapter/Test/AgentConnection.php
@@ -0,0 +1,51 @@
+<?php
+/*
+ * Fusio - Self-Hosted API Management for Builders.
+ * For the current version and information visit <https://www.fusio-project.org/>
+ *
+ * Copyright (c) Christoph Kappestein <christoph.kappestein@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Fusio\Impl\Tests\Adapter\Test;
+
+use Fusio\Engine\ConnectionAbstract;
+use Fusio\Engine\ParametersInterface;
+use Symfony\AI\Agent\MockAgent;
+use Symfony\AI\Agent\MockResponse;
+
+/**
+ * AgentConnection
+ *
+ * @author  Christoph Kappestein <christoph.kappestein@gmail.com>
+ * @license http://www.apache.org/licenses/LICENSE-2.0
+ * @link    https://www.fusio-project.org
+ */
+class AgentConnection extends ConnectionAbstract
+{
+    public function getName(): string
+    {
+        return 'Agent-Connection';
+    }
+
+    public function getConnection(ParametersInterface $config): mixed
+    {
+        $response = new MockResponse('The answer ist: 42');
+
+        $agent = new MockAgent();
+        $agent->addResponse('What is the meaning of life?', $response);
+
+        return $agent;
+    }
+}
diff --git a/tests/Adapter/container.php b/tests/Adapter/container.php
index 20ba5af56..01b46cd4e 100644
--- a/tests/Adapter/container.php
+++ b/tests/Adapter/container.php
@@ -1,6 +1,7 @@
 <?php
 
 use Fusio\Engine\Adapter\ServiceBuilder;
+use Fusio\Impl\Tests\Adapter\Test\AgentConnection;
 use Fusio\Impl\Tests\Adapter\Test\InspectAction;
 use Fusio\Impl\Tests\Adapter\Test\MimeAction;
 use Fusio\Impl\Tests\Adapter\Test\Paypal;
@@ -12,6 +13,7 @@
 
 return static function (ContainerConfigurator $container) {
     $services = ServiceBuilder::build($container);
+    $services->set(AgentConnection::class);
     $services->set(InspectAction::class);
     $services->set(MimeAction::class);
     $services->set(Paypal::class);
diff --git a/tests/Authorization/ClientCredentialsTest.php b/tests/Authorization/ClientCredentialsTest.php
index 914d4eaa5..4348ebeb9 100644
--- a/tests/Authorization/ClientCredentialsTest.php
+++ b/tests/Authorization/ClientCredentialsTest.php
@@ -44,7 +44,7 @@ public function testPost()
         ], $body);
 
         // if we provide no explicit scopes we get all scopes assigned to the user
-        $this->assertAccessToken($response, 'backend,backend.account,backend.action,backend.app,backend.audit,backend.backup,backend.bundle,backend.category,backend.config,backend.connection,backend.cronjob,backend.dashboard,backend.event,backend.firewall,backend.form,backend.generator,backend.identity,backend.log,backend.marketplace,backend.operation,backend.page,backend.plan,backend.rate,backend.role,backend.schema,backend.scope,backend.sdk,backend.statistic,backend.taxonomy,backend.tenant,backend.test,backend.token,backend.transaction,backend.trash,backend.trigger,backend.user,backend.webhook,consumer,consumer.account,consumer.app,consumer.event,consumer.form,consumer.grant,consumer.identity,consumer.log,consumer.page,consumer.payment,consumer.plan,consumer.scope,consumer.token,consumer.transaction,consumer.webhook,authorization,foo,bar', 4);
+        $this->assertAccessToken($response, 'backend,backend.account,backend.action,backend.agent,backend.app,backend.audit,backend.backup,backend.bundle,backend.category,backend.config,backend.connection,backend.cronjob,backend.dashboard,backend.event,backend.firewall,backend.form,backend.generator,backend.identity,backend.log,backend.marketplace,backend.operation,backend.page,backend.plan,backend.rate,backend.role,backend.schema,backend.scope,backend.sdk,backend.statistic,backend.taxonomy,backend.tenant,backend.test,backend.token,backend.transaction,backend.trash,backend.trigger,backend.user,backend.webhook,consumer,consumer.account,consumer.app,consumer.event,consumer.form,consumer.grant,consumer.identity,consumer.log,consumer.page,consumer.payment,consumer.plan,consumer.scope,consumer.token,consumer.transaction,consumer.webhook,authorization,foo,bar', 4);
     }
 
     public function testPostSpecificScope()
@@ -68,7 +68,7 @@ public function testPostEmail()
             'Content-Type'  => 'application/x-www-form-urlencoded',
         ], $body);
 
-        $this->assertAccessToken($response, 'backend,backend.account,backend.action,backend.app,backend.audit,backend.backup,backend.bundle,backend.category,backend.config,backend.connection,backend.cronjob,backend.dashboard,backend.event,backend.firewall,backend.form,backend.generator,backend.identity,backend.log,backend.marketplace,backend.operation,backend.page,backend.plan,backend.rate,backend.role,backend.schema,backend.scope,backend.sdk,backend.statistic,backend.taxonomy,backend.tenant,backend.test,backend.token,backend.transaction,backend.trash,backend.trigger,backend.user,backend.webhook,consumer,consumer.account,consumer.app,consumer.event,consumer.form,consumer.grant,consumer.identity,consumer.log,consumer.page,consumer.payment,consumer.plan,consumer.scope,consumer.token,consumer.transaction,consumer.webhook,authorization,foo,bar', 4);
+        $this->assertAccessToken($response, 'backend,backend.account,backend.action,backend.agent,backend.app,backend.audit,backend.backup,backend.bundle,backend.category,backend.config,backend.connection,backend.cronjob,backend.dashboard,backend.event,backend.firewall,backend.form,backend.generator,backend.identity,backend.log,backend.marketplace,backend.operation,backend.page,backend.plan,backend.rate,backend.role,backend.schema,backend.scope,backend.sdk,backend.statistic,backend.taxonomy,backend.tenant,backend.test,backend.token,backend.transaction,backend.trash,backend.trigger,backend.user,backend.webhook,consumer,consumer.account,consumer.app,consumer.event,consumer.form,consumer.grant,consumer.identity,consumer.log,consumer.page,consumer.payment,consumer.plan,consumer.scope,consumer.token,consumer.transaction,consumer.webhook,authorization,foo,bar', 4);
     }
 
     /**
diff --git a/tests/Backend/Api/Account/AccountTest.php b/tests/Backend/Api/Account/AccountTest.php
index 5b6e97d62..dfca47555 100644
--- a/tests/Backend/Api/Account/AccountTest.php
+++ b/tests/Backend/Api/Account/AccountTest.php
@@ -54,6 +54,7 @@ public function testGet()
         "backend",
         "backend.account",
         "backend.action",
+        "backend.agent",
         "backend.app",
         "backend.audit",
         "backend.backup",
diff --git a/tests/Backend/Api/Agent/CollectionTest.php b/tests/Backend/Api/Agent/CollectionTest.php
new file mode 100644
index 000000000..64110d316
--- /dev/null
+++ b/tests/Backend/Api/Agent/CollectionTest.php
@@ -0,0 +1,201 @@
+<?php
+/*
+ * Fusio - Self-Hosted API Management for Builders.
+ * For the current version and information visit <https://www.fusio-project.org/>
+ *
+ * Copyright (c) Christoph Kappestein <christoph.kappestein@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Fusio\Impl\Tests\Backend\Api\Agent;
+
+use Fusio\Impl\Table;
+use Fusio\Impl\Tests\DbTestCase;
+
+/**
+ * CollectionTest
+ *
+ * @author  Christoph Kappestein <christoph.kappestein@gmail.com>
+ * @license http://www.apache.org/licenses/LICENSE-2.0
+ * @link    https://www.fusio-project.org
+ */
+class CollectionTest extends DbTestCase
+{
+    public function testGet()
+    {
+        $response = $this->sendRequest('/backend/agent', 'GET', array(
+            'User-Agent'    => 'Fusio TestCase',
+            'Authorization' => 'Bearer da250526d583edabca8ac2f99e37ee39aa02a3c076c0edc6929095e20ca18dcf'
+        ));
+
+        $body   = (string) $response->getBody();
+        $expect = <<<'JSON'
+{
+    "totalResults": 1,
+    "startIndex": 0,
+    "itemsPerPage": 16,
+    "entry": [
+        {
+            "id": 1,
+            "status": 1,
+            "type": 0,
+            "name": "agent-test",
+            "description": "An agent test",
+            "outgoing": "schema:\/\/Entry-Schema",
+            "action": "action:\/\/Inspect-Action",
+            "insertDate": "2026-02-22T13:06:00Z"
+        }
+    ]
+}
+JSON;
+
+        $this->assertEquals(200, $response->getStatusCode(), $body);
+        $this->assertJsonStringEqualsJsonString($expect, $body, $body);
+    }
+
+    public function testGetSearch()
+    {
+        $response = $this->sendRequest('/backend/agent?search=tes', 'GET', array(
+            'User-Agent'    => 'Fusio TestCase',
+            'Authorization' => 'Bearer da250526d583edabca8ac2f99e37ee39aa02a3c076c0edc6929095e20ca18dcf'
+        ));
+
+        $body   = (string) $response->getBody();
+        $expect = <<<'JSON'
+{
+    "totalResults": 1,
+    "startIndex": 0,
+    "itemsPerPage": 16,
+    "entry": [
+        {
+            "id": 1,
+            "status": 1,
+            "type": 0,
+            "name": "agent-test",
+            "description": "An agent test",
+            "outgoing": "schema:\/\/Entry-Schema",
+            "action": "action:\/\/Inspect-Action",
+            "insertDate": "2026-02-22T13:06:00Z"
+        }
+    ]
+}
+JSON;
+
+        $this->assertEquals(200, $response->getStatusCode(), $body);
+        $this->assertJsonStringEqualsJsonString($expect, $body, $body);
+    }
+
+    public function testGetCount()
+    {
+        $response = $this->sendRequest('/backend/agent?count=80', 'GET', array(
+            'User-Agent'    => 'Fusio TestCase',
+            'Authorization' => 'Bearer da250526d583edabca8ac2f99e37ee39aa02a3c076c0edc6929095e20ca18dcf'
+        ));
+
+        $body   = (string) $response->getBody();
+        $expect = <<<'JSON'
+{
+    "totalResults": 1,
+    "startIndex": 0,
+    "itemsPerPage": 80,
+    "entry": [
+        {
+            "id": 1,
+            "status": 1,
+            "type": 0,
+            "name": "agent-test",
+            "description": "An agent test",
+            "outgoing": "schema:\/\/Entry-Schema",
+            "action": "action:\/\/Inspect-Action",
+            "insertDate": "2026-02-22T13:06:00Z"
+        }
+    ]
+}
+JSON;
+
+        $this->assertEquals(200, $response->getStatusCode(), $body);
+        $this->assertJsonStringEqualsJsonString($expect, $body, $body);
+    }
+
+    public function testPost()
+    {
+        $response = $this->sendRequest('/backend/agent', 'POST', array(
+            'User-Agent'    => 'Fusio TestCase',
+            'Authorization' => 'Bearer da250526d583edabca8ac2f99e37ee39aa02a3c076c0edc6929095e20ca18dcf'
+        ), json_encode([
+            'connection' => 8,
+            'type' => Table\Agent::TYPE_GENERAL,
+            'name' => 'my-agent',
+            'description' => 'A short agent description',
+            'introduction' => 'Your an helpful agent which returns only useful information',
+        ]));
+
+        $body   = (string) $response->getBody();
+        $expect = <<<'JSON'
+{
+    "success": true,
+    "message": "Agent successfully created",
+    "id": "2"
+}
+JSON;
+
+        $this->assertEquals(201, $response->getStatusCode(), $body);
+        $this->assertJsonStringEqualsJsonString($expect, $body, $body);
+
+        // check database
+        $sql = $this->connection->createQueryBuilder()
+            ->select('status', 'type', 'name', 'description', 'introduction')
+            ->from('fusio_agent')
+            ->orderBy('id', 'DESC')
+            ->setFirstResult(0)
+            ->setMaxResults(1)
+            ->getSQL();
+
+        $row = $this->connection->fetchAssociative($sql);
+
+        $this->assertEquals(1, $row['status']);
+        $this->assertEquals(0, $row['type']);
+        $this->assertEquals('my-agent', $row['name']);
+        $this->assertEquals('A short agent description', $row['description']);
+        $this->assertEquals('Your an helpful agent which returns only useful information', $row['introduction']);
+    }
+
+    public function testPut()
+    {
+        $response = $this->sendRequest('/backend/agent', 'PUT', array(
+            'User-Agent'    => 'Fusio TestCase',
+            'Authorization' => 'Bearer da250526d583edabca8ac2f99e37ee39aa02a3c076c0edc6929095e20ca18dcf'
+        ), json_encode([
+            'foo' => 'bar',
+        ]));
+
+        $body = (string) $response->getBody();
+
+        $this->assertEquals(404, $response->getStatusCode(), $body);
+    }
+
+    public function testDelete()
+    {
+        $response = $this->sendRequest('/backend/agent', 'DELETE', array(
+            'User-Agent'    => 'Fusio TestCase',
+            'Authorization' => 'Bearer da250526d583edabca8ac2f99e37ee39aa02a3c076c0edc6929095e20ca18dcf'
+        ), json_encode([
+            'foo' => 'bar',
+        ]));
+
+        $body = (string) $response->getBody();
+
+        $this->assertEquals(404, $response->getStatusCode(), $body);
+    }
+}
diff --git a/tests/Backend/Api/Agent/EntityTest.php b/tests/Backend/Api/Agent/EntityTest.php
new file mode 100644
index 000000000..b27d11a2e
--- /dev/null
+++ b/tests/Backend/Api/Agent/EntityTest.php
@@ -0,0 +1,171 @@
+<?php
+/*
+ * Fusio - Self-Hosted API Management for Builders.
+ * For the current version and information visit <https://www.fusio-project.org/>
+ *
+ * Copyright (c) Christoph Kappestein <christoph.kappestein@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Fusio\Impl\Tests\Backend\Api\Agent;
+
+use Fusio\Impl\Tests\DbTestCase;
+use Fusio\Impl\Tests\Fixture;
+
+/**
+ * EntityTest
+ *
+ * @author  Christoph Kappestein <christoph.kappestein@gmail.com>
+ * @license http://www.apache.org/licenses/LICENSE-2.0
+ * @link    https://www.fusio-project.org
+ */
+class EntityTest extends DbTestCase
+{
+    private $id;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->id = Fixture::getReference('fusio_agent', 'agent-test')->resolve($this->connection);
+    }
+
+    public function testGet()
+    {
+        $response = $this->sendRequest('/backend/agent/' . $this->id, 'GET', array(
+            'User-Agent'    => 'Fusio TestCase',
+            'Authorization' => 'Bearer da250526d583edabca8ac2f99e37ee39aa02a3c076c0edc6929095e20ca18dcf'
+        ));
+
+        $body   = (string) $response->getBody();
+        $expect = <<<JSON
+{
+    "id": {$this->id},
+    "status": 1,
+    "type": 0,
+    "name": "agent-test",
+    "description": "An agent test",
+    "introduction": "A test agent which always return \"Hello World\"",
+    "tools": [
+        "test_listFoo"
+    ],
+    "outgoing": "schema:\/\/Entry-Schema",
+    "action": "action:\/\/Inspect-Action",
+    "insertDate": "2026-02-22T13:06:00Z"
+}
+JSON;
+
+        $this->assertEquals(200, $response->getStatusCode(), $body);
+        $this->assertJsonStringEqualsJsonString($expect, $body, $body);
+    }
+
+    public function testGetNotFound()
+    {
+        $response = $this->sendRequest('/backend/agent/10', 'GET', array(
+            'User-Agent'    => 'Fusio TestCase',
+            'Authorization' => 'Bearer da250526d583edabca8ac2f99e37ee39aa02a3c076c0edc6929095e20ca18dcf'
+        ));
+
+        $body = (string) $response->getBody();
+        $data = \json_decode($body);
+
+        $this->assertEquals(404, $response->getStatusCode(), $body);
+        $this->assertFalse($data->success);
+        $this->assertStringStartsWith('Could not find agent', $data->message);
+    }
+
+    public function testPost()
+    {
+        $response = $this->sendRequest('/backend/agent/' . $this->id, 'POST', array(
+            'User-Agent'    => 'Fusio TestCase',
+            'Authorization' => 'Bearer da250526d583edabca8ac2f99e37ee39aa02a3c076c0edc6929095e20ca18dcf'
+        ), json_encode([
+            'foo' => 'bar',
+        ]));
+
+        $body = (string) $response->getBody();
+
+        $this->assertEquals(404, $response->getStatusCode(), $body);
+    }
+
+    public function testPut()
+    {
+        $response = $this->sendRequest('/backend/agent/' . $this->id, 'PUT', array(
+            'User-Agent'    => 'Fusio TestCase',
+            'Authorization' => 'Bearer da250526d583edabca8ac2f99e37ee39aa02a3c076c0edc6929095e20ca18dcf'
+        ), json_encode([
+            'name' => 'foo',
+            'description' => 'foo',
+            'introduction' => 'foo',
+        ]));
+
+        $body   = (string) $response->getBody();
+        $expect = <<<'JSON'
+{
+    "success": true,
+    "message": "Agent successfully updated",
+    "id": "1"
+}
+JSON;
+
+        $this->assertEquals(200, $response->getStatusCode(), $body);
+        $this->assertJsonStringEqualsJsonString($expect, $body, $body);
+
+        // check database
+        $sql = $this->connection->createQueryBuilder()
+            ->select('status', 'type', 'name', 'description', 'introduction')
+            ->from('fusio_agent')
+            ->where('id = :id')
+            ->getSQL();
+
+        $row = $this->connection->fetchAssociative($sql, ['id' => $this->id]);
+
+        $this->assertEquals(1, $row['status']);
+        $this->assertEquals(0, $row['type']);
+        $this->assertEquals('foo', $row['name']);
+        $this->assertEquals('foo', $row['description']);
+        $this->assertEquals('foo', $row['introduction']);
+    }
+
+    public function testDelete()
+    {
+        $response = $this->sendRequest('/backend/agent/' . $this->id, 'DELETE', array(
+            'User-Agent'    => 'Fusio TestCase',
+            'Authorization' => 'Bearer da250526d583edabca8ac2f99e37ee39aa02a3c076c0edc6929095e20ca18dcf'
+        ));
+
+        $body   = (string) $response->getBody();
+        $expect = <<<'JSON'
+{
+    "success": true,
+    "message": "Agent successfully deleted",
+    "id": "1"
+}
+JSON;
+
+        $this->assertEquals(200, $response->getStatusCode(), $body);
+        $this->assertJsonStringEqualsJsonString($expect, $body, $body);
+
+        // check database
+        $sql = $this->connection->createQueryBuilder()
+            ->select('id', 'status')
+            ->from('fusio_agent')
+            ->where('id = :id')
+            ->getSQL();
+
+        $row = $this->connection->fetchAssociative($sql, ['id' => $this->id]);
+
+        $this->assertEquals(0, $row['status']);
+    }
+}
diff --git a/tests/Backend/Api/Agent/Message/CollectionTest.php b/tests/Backend/Api/Agent/Message/CollectionTest.php
new file mode 100644
index 000000000..409a40473
--- /dev/null
+++ b/tests/Backend/Api/Agent/Message/CollectionTest.php
@@ -0,0 +1,163 @@
+<?php
+/*
+ * Fusio - Self-Hosted API Management for Builders.
+ * For the current version and information visit <https://www.fusio-project.org/>
+ *
+ * Copyright (c) Christoph Kappestein <christoph.kappestein@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Fusio\Impl\Tests\Backend\Api\Agent\Message;
+
+use Fusio\Impl\Table;
+use Fusio\Impl\Tests\DbTestCase;
+use PSX\Json\Parser;
+
+/**
+ * CollectionTest
+ *
+ * @author  Christoph Kappestein <christoph.kappestein@gmail.com>
+ * @license http://www.apache.org/licenses/LICENSE-2.0
+ * @link    https://www.fusio-project.org
+ */
+class CollectionTest extends DbTestCase
+{
+    public function testGet()
+    {
+        $response = $this->sendRequest('/backend/agent/1/message', 'GET', array(
+            'User-Agent'    => 'Fusio TestCase',
+            'Authorization' => 'Bearer da250526d583edabca8ac2f99e37ee39aa02a3c076c0edc6929095e20ca18dcf'
+        ));
+
+        $body   = (string) $response->getBody();
+        $expect = <<<'JSON'
+{
+    "totalResults": 1,
+    "startIndex": 0,
+    "itemsPerPage": 16,
+    "entry": [
+        {
+            "id": 1,
+            "role": "user",
+            "content": {
+                "type": "text",
+                "content": "This is a test message"
+            },
+            "insertDate": "2026-02-22T19:17:00Z"
+        }
+    ]
+}
+JSON;
+
+        $this->assertEquals(200, $response->getStatusCode(), $body);
+        $this->assertJsonStringEqualsJsonString($expect, $body, $body);
+    }
+    public function testGetParent()
+    {
+        $response = $this->sendRequest('/backend/agent/1/message?parent=1', 'GET', array(
+            'User-Agent'    => 'Fusio TestCase',
+            'Authorization' => 'Bearer da250526d583edabca8ac2f99e37ee39aa02a3c076c0edc6929095e20ca18dcf'
+        ));
+
+        $body   = (string) $response->getBody();
+        $expect = <<<'JSON'
+{
+    "totalResults": 1,
+    "startIndex": 0,
+    "itemsPerPage": 16,
+    "entry": [
+        {
+            "id": 2,
+            "role": "assistant",
+            "content": {
+                "type": "text",
+                "content": "And an agent response"
+            },
+            "insertDate": "2026-02-22T19:17:00Z"
+        }
+    ]
+}
+JSON;
+
+        $this->assertEquals(200, $response->getStatusCode(), $body);
+        $this->assertJsonStringEqualsJsonString($expect, $body, $body);
+    }
+
+    public function testPost()
+    {
+        $response = $this->sendRequest('/backend/agent/1/message', 'POST', array(
+            'User-Agent'    => 'Fusio TestCase',
+            'Authorization' => 'Bearer da250526d583edabca8ac2f99e37ee39aa02a3c076c0edc6929095e20ca18dcf'
+        ), json_encode([
+            'type' => 'text',
+            'content' => 'What is the meaning of life?',
+        ]));
+
+        $body   = (string) $response->getBody();
+        $expect = <<<'JSON'
+{
+    "id": 4,
+    "role": "assistant",
+    "content": {
+        "type": "text",
+        "content": "The answer ist: 42"
+    }
+}
+JSON;
+
+        $this->assertEquals(201, $response->getStatusCode(), $body);
+        $this->assertJsonStringEqualsJsonString($expect, $body, $body);
+
+        // check database
+        $sql = $this->connection->createQueryBuilder()
+            ->select('origin', 'content')
+            ->from('fusio_agent_message')
+            ->where('agent_id = :agent_id')
+            ->orderBy('id', 'DESC')
+            ->getSQL();
+
+        $row = $this->connection->fetchAssociative($sql, ['agent_id' => 1]);
+
+        $this->assertEquals(2, $row['origin']);
+        $this->assertJsonStringEqualsJsonString(Parser::encode(['type' => 'text', 'content' => 'The answer ist: 42']), $row['content']);
+    }
+
+    public function testPut()
+    {
+        $response = $this->sendRequest('/backend/agent/1/message', 'PUT', array(
+            'User-Agent'    => 'Fusio TestCase',
+            'Authorization' => 'Bearer da250526d583edabca8ac2f99e37ee39aa02a3c076c0edc6929095e20ca18dcf'
+        ), json_encode([
+            'foo' => 'bar',
+        ]));
+
+        $body = (string) $response->getBody();
+
+        $this->assertEquals(404, $response->getStatusCode(), $body);
+    }
+
+    public function testDelete()
+    {
+        $response = $this->sendRequest('/backend/agent/1/message', 'DELETE', array(
+            'User-Agent'    => 'Fusio TestCase',
+            'Authorization' => 'Bearer da250526d583edabca8ac2f99e37ee39aa02a3c076c0edc6929095e20ca18dcf'
+        ), json_encode([
+            'foo' => 'bar',
+        ]));
+
+        $body = (string) $response->getBody();
+
+        $this->assertEquals(404, $response->getStatusCode(), $body);
+    }
+}
diff --git a/tests/Backend/Api/Agent/ToolsTest.php b/tests/Backend/Api/Agent/ToolsTest.php
new file mode 100644
index 000000000..4aba11440
--- /dev/null
+++ b/tests/Backend/Api/Agent/ToolsTest.php
@@ -0,0 +1,1121 @@
+<?php
+/*
+ * Fusio - Self-Hosted API Management for Builders.
+ * For the current version and information visit <https://www.fusio-project.org/>
+ *
+ * Copyright (c) Christoph Kappestein <christoph.kappestein@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Fusio\Impl\Tests\Backend\Api\Agent;
+
+use Fusio\Impl\Table;
+use Fusio\Impl\Tests\DbTestCase;
+
+/**
+ * ToolsTest
+ *
+ * @author  Christoph Kappestein <christoph.kappestein@gmail.com>
+ * @license http://www.apache.org/licenses/LICENSE-2.0
+ * @link    https://www.fusio-project.org
+ */
+class ToolsTest extends DbTestCase
+{
+    public function testGet()
+    {
+        $response = $this->sendRequest('/backend/agent/tools', 'GET', array(
+            'User-Agent'    => 'Fusio TestCase',
+            'Authorization' => 'Bearer da250526d583edabca8ac2f99e37ee39aa02a3c076c0edc6929095e20ca18dcf'
+        ));
+
+        $body   = (string) $response->getBody();
+        $expect = <<<'JSON'
+{
+    "tools": [
+        {
+            "name": "authorization_getWhoami",
+            "description": "Returns user data of the current authenticated user"
+        },
+        {
+            "name": "authorization_revoke",
+            "description": "Revoke the access token of the current authenticated user"
+        },
+        {
+            "name": "backend_account_changePassword",
+            "description": "Changes the password of the authenticated user"
+        },
+        {
+            "name": "backend_account_get",
+            "description": "Returns user data of the authenticated user"
+        },
+        {
+            "name": "backend_account_update",
+            "description": "Updates user data of the authenticated user"
+        },
+        {
+            "name": "backend_action_create",
+            "description": "Creates a new action"
+        },
+        {
+            "name": "backend_action_delete",
+            "description": "Deletes an existing action"
+        },
+        {
+            "name": "backend_action_execute",
+            "description": "Executes a specific action. This method should be used to test an action configuration"
+        },
+        {
+            "name": "backend_action_get",
+            "description": "Returns a specific action"
+        },
+        {
+            "name": "backend_action_getAll",
+            "description": "Returns a paginated list of actions"
+        },
+        {
+            "name": "backend_action_getClasses",
+            "description": "Returns all available action classes"
+        },
+        {
+            "name": "backend_action_getCommits",
+            "description": "Returns a paginated list of action commits"
+        },
+        {
+            "name": "backend_action_getForm",
+            "description": "Returns the action config form"
+        },
+        {
+            "name": "backend_action_update",
+            "description": "Updates an existing action"
+        },
+        {
+            "name": "backend_agent_create",
+            "description": "Creates a new agent"
+        },
+        {
+            "name": "backend_agent_delete",
+            "description": "Deletes an existing agent"
+        },
+        {
+            "name": "backend_agent_get",
+            "description": "Returns a specific agent"
+        },
+        {
+            "name": "backend_agent_getAll",
+            "description": "Returns a paginated list of agents"
+        },
+        {
+            "name": "backend_agent_getTools",
+            "description": "Returns available tools for an agent"
+        },
+        {
+            "name": "backend_agent_message_getAll",
+            "description": "Returns a paginated list of agent messages"
+        },
+        {
+            "name": "backend_agent_message_submit",
+            "description": "Submits a new agent message"
+        },
+        {
+            "name": "backend_agent_update",
+            "description": "Updates an existing agent"
+        },
+        {
+            "name": "backend_app_create",
+            "description": "Creates a new app"
+        },
+        {
+            "name": "backend_app_delete",
+            "description": "Deletes an existing app"
+        },
+        {
+            "name": "backend_app_deleteToken",
+            "description": "Deletes an existing token from an app"
+        },
+        {
+            "name": "backend_app_get",
+            "description": "Returns a specific app"
+        },
+        {
+            "name": "backend_app_getAll",
+            "description": "Returns a paginated list of apps"
+        },
+        {
+            "name": "backend_app_update",
+            "description": "Updates an existing app"
+        },
+        {
+            "name": "backend_audit_get",
+            "description": "Returns a specific audit"
+        },
+        {
+            "name": "backend_audit_getAll",
+            "description": "Returns a paginated list of audits"
+        },
+        {
+            "name": "backend_backup_export",
+            "description": "Generates an backup of the current system"
+        },
+        {
+            "name": "backend_backup_import",
+            "description": "Imports an backup to the current system"
+        },
+        {
+            "name": "backend_bundle_create",
+            "description": "Creates a new bundle"
+        },
+        {
+            "name": "backend_bundle_delete",
+            "description": "Deletes an existing bundle"
+        },
+        {
+            "name": "backend_bundle_get",
+            "description": "Returns a specific bundle"
+        },
+        {
+            "name": "backend_bundle_getAll",
+            "description": "Returns a paginated list of bundles"
+        },
+        {
+            "name": "backend_bundle_publish",
+            "description": "Publish an existing bundle to the marketplace"
+        },
+        {
+            "name": "backend_bundle_update",
+            "description": "Updates an existing bundle"
+        },
+        {
+            "name": "backend_category_create",
+            "description": "Creates a new category"
+        },
+        {
+            "name": "backend_category_delete",
+            "description": "Deletes an existing category"
+        },
+        {
+            "name": "backend_category_get",
+            "description": "Returns a specific category"
+        },
+        {
+            "name": "backend_category_getAll",
+            "description": "Returns a paginated list of categories"
+        },
+        {
+            "name": "backend_category_update",
+            "description": "Updates an existing category"
+        },
+        {
+            "name": "backend_config_get",
+            "description": "Returns a specific config"
+        },
+        {
+            "name": "backend_config_getAll",
+            "description": "Returns a paginated list of configuration values"
+        },
+        {
+            "name": "backend_config_update",
+            "description": "Updates an existing config value"
+        },
+        {
+            "name": "backend_connection_agent_send",
+            "description": "Sends a message to an agent"
+        },
+        {
+            "name": "backend_connection_create",
+            "description": "Creates a new connection"
+        },
+        {
+            "name": "backend_connection_database_createRow",
+            "description": "Creates a new row at a table on a database"
+        },
+        {
+            "name": "backend_connection_database_createTable",
+            "description": "Creates a new table on a database"
+        },
+        {
+            "name": "backend_connection_database_deleteRow",
+            "description": "Deletes an existing row at a table on a database"
+        },
+        {
+            "name": "backend_connection_database_deleteTable",
+            "description": "Deletes an existing table on a database"
+        },
+        {
+            "name": "backend_connection_database_getRow",
+            "description": "Returns a specific row at a table on a database"
+        },
+        {
+            "name": "backend_connection_database_getRows",
+            "description": "Returns paginated rows at a table on a database"
+        },
+        {
+            "name": "backend_connection_database_getTable",
+            "description": "Returns the schema of a specific table on a database"
+        },
+        {
+            "name": "backend_connection_database_getTables",
+            "description": "Returns all available tables on a database"
+        },
+        {
+            "name": "backend_connection_database_updateRow",
+            "description": "Updates an existing row at a table on a database"
+        },
+        {
+            "name": "backend_connection_database_updateTable",
+            "description": "Updates an existing table on a database"
+        },
+        {
+            "name": "backend_connection_delete",
+            "description": "Deletes an existing connection"
+        },
+        {
+            "name": "backend_connection_filesystem_delete",
+            "description": "Deletes an existing file on the filesystem connection"
+        },
+        {
+            "name": "backend_connection_filesystem_get",
+            "description": "Returns the content of the provided file id on the filesystem connection"
+        },
+        {
+            "name": "backend_connection_filesystem_getAll",
+            "description": "Returns all available files on the filesystem connection"
+        },
+        {
+            "name": "backend_connection_get",
+            "description": "Returns a specific connection"
+        },
+        {
+            "name": "backend_connection_getAll",
+            "description": "Returns a paginated list of connections"
+        },
+        {
+            "name": "backend_connection_getClasses",
+            "description": "Returns all available connection classes"
+        },
+        {
+            "name": "backend_connection_getForm",
+            "description": "Returns the connection config form"
+        },
+        {
+            "name": "backend_connection_getRedirect",
+            "description": "Returns a redirect url to start the OAuth2 authorization flow for the given connection"
+        },
+        {
+            "name": "backend_connection_http_execute",
+            "description": "Sends an arbitrary HTTP request to the connection"
+        },
+        {
+            "name": "backend_connection_sdk_get",
+            "description": "Returns the SDK specification"
+        },
+        {
+            "name": "backend_connection_update",
+            "description": "Updates an existing connection"
+        },
+        {
+            "name": "backend_cronjob_create",
+            "description": "Creates a new cronjob"
+        },
+        {
+            "name": "backend_cronjob_delete",
+            "description": "Deletes an existing cronjob"
+        },
+        {
+            "name": "backend_cronjob_get",
+            "description": "Returns a specific cronjob"
+        },
+        {
+            "name": "backend_cronjob_getAll",
+            "description": "Returns a paginated list of cronjobs"
+        },
+        {
+            "name": "backend_cronjob_update",
+            "description": "Updates an existing cronjob"
+        },
+        {
+            "name": "backend_dashboard_getAll",
+            "description": "Returns all available dashboard widgets"
+        },
+        {
+            "name": "backend_event_create",
+            "description": "Creates a new event"
+        },
+        {
+            "name": "backend_event_delete",
+            "description": "Deletes an existing event"
+        },
+        {
+            "name": "backend_event_get",
+            "description": "Returns a specific event"
+        },
+        {
+            "name": "backend_event_getAll",
+            "description": "Returns a paginated list of events"
+        },
+        {
+            "name": "backend_event_update",
+            "description": "Updates an existing event"
+        },
+        {
+            "name": "backend_firewall_create",
+            "description": "Creates a new firewall rule"
+        },
+        {
+            "name": "backend_firewall_delete",
+            "description": "Deletes an existing firewall rule"
+        },
+        {
+            "name": "backend_firewall_get",
+            "description": "Returns a specific firewall rule"
+        },
+        {
+            "name": "backend_firewall_getAll",
+            "description": "Returns a paginated list of firewall rules"
+        },
+        {
+            "name": "backend_firewall_update",
+            "description": "Updates an existing firewall rule"
+        },
+        {
+            "name": "backend_form_create",
+            "description": "Creates a new form"
+        },
+        {
+            "name": "backend_form_delete",
+            "description": "Deletes an existing form"
+        },
+        {
+            "name": "backend_form_get",
+            "description": "Returns a specific form"
+        },
+        {
+            "name": "backend_form_getAll",
+            "description": "Returns a paginated list of forms"
+        },
+        {
+            "name": "backend_form_update",
+            "description": "Updates an existing form"
+        },
+        {
+            "name": "backend_generator_executeProvider",
+            "description": "Executes a generator with the provided config"
+        },
+        {
+            "name": "backend_generator_getChangelog",
+            "description": "Generates a changelog of all potential changes if you execute this generator with the provided config"
+        },
+        {
+            "name": "backend_generator_getClasses",
+            "description": "Returns all available generator classes"
+        },
+        {
+            "name": "backend_generator_getForm",
+            "description": "Returns the generator config form"
+        },
+        {
+            "name": "backend_identity_create",
+            "description": "Creates a new identity"
+        },
+        {
+            "name": "backend_identity_delete",
+            "description": "Deletes an existing identity"
+        },
+        {
+            "name": "backend_identity_get",
+            "description": "Returns a specific identity"
+        },
+        {
+            "name": "backend_identity_getAll",
+            "description": "Returns a paginated list of identities"
+        },
+        {
+            "name": "backend_identity_getClasses",
+            "description": "Returns all available identity classes"
+        },
+        {
+            "name": "backend_identity_getForm",
+            "description": "Returns the identity config form"
+        },
+        {
+            "name": "backend_identity_update",
+            "description": "Updates an existing identity"
+        },
+        {
+            "name": "backend_log_get",
+            "description": "Returns a specific log"
+        },
+        {
+            "name": "backend_log_getAll",
+            "description": "Returns a paginated list of logs"
+        },
+        {
+            "name": "backend_log_getAllErrors",
+            "description": "Returns a paginated list of log errors"
+        },
+        {
+            "name": "backend_log_getError",
+            "description": "Returns a specific error"
+        },
+        {
+            "name": "backend_marketplace_action_get",
+            "description": "Returns a specific marketplace action"
+        },
+        {
+            "name": "backend_marketplace_action_getAll",
+            "description": "Returns a paginated list of marketplace actions"
+        },
+        {
+            "name": "backend_marketplace_action_install",
+            "description": "Installs an action from the marketplace"
+        },
+        {
+            "name": "backend_marketplace_action_upgrade",
+            "description": "Upgrades an action from the marketplace"
+        },
+        {
+            "name": "backend_marketplace_app_get",
+            "description": "Returns a specific marketplace app"
+        },
+        {
+            "name": "backend_marketplace_app_getAll",
+            "description": "Returns a paginated list of marketplace apps"
+        },
+        {
+            "name": "backend_marketplace_app_install",
+            "description": "Installs an app from the marketplace"
+        },
+        {
+            "name": "backend_marketplace_app_upgrade",
+            "description": "Upgrades an app from the marketplace"
+        },
+        {
+            "name": "backend_marketplace_bundle_get",
+            "description": "Returns a specific marketplace bundle"
+        },
+        {
+            "name": "backend_marketplace_bundle_getAll",
+            "description": "Returns a paginated list of marketplace bundles"
+        },
+        {
+            "name": "backend_marketplace_bundle_install",
+            "description": "Installs an bundle from the marketplace"
+        },
+        {
+            "name": "backend_marketplace_bundle_upgrade",
+            "description": "Upgrades an bundle from the marketplace"
+        },
+        {
+            "name": "backend_operation_create",
+            "description": "Creates a new operation"
+        },
+        {
+            "name": "backend_operation_delete",
+            "description": "Deletes an existing operation"
+        },
+        {
+            "name": "backend_operation_get",
+            "description": "Returns a specific operation"
+        },
+        {
+            "name": "backend_operation_getAll",
+            "description": "Returns a paginated list of operations"
+        },
+        {
+            "name": "backend_operation_update",
+            "description": "Updates an existing operation"
+        },
+        {
+            "name": "backend_page_create",
+            "description": "Creates a new page"
+        },
+        {
+            "name": "backend_page_delete",
+            "description": "Deletes an existing page"
+        },
+        {
+            "name": "backend_page_get",
+            "description": "Returns a specific page"
+        },
+        {
+            "name": "backend_page_getAll",
+            "description": "Returns a paginated list of pages"
+        },
+        {
+            "name": "backend_page_update",
+            "description": "Updates an existing page"
+        },
+        {
+            "name": "backend_plan_create",
+            "description": "Creates a new plan"
+        },
+        {
+            "name": "backend_plan_delete",
+            "description": "Deletes an existing plan"
+        },
+        {
+            "name": "backend_plan_get",
+            "description": "Returns a specific plan"
+        },
+        {
+            "name": "backend_plan_getAll",
+            "description": "Returns a paginated list of plans"
+        },
+        {
+            "name": "backend_plan_update",
+            "description": "Updates an existing plan"
+        },
+        {
+            "name": "backend_rate_create",
+            "description": "Creates a new rate limitation"
+        },
+        {
+            "name": "backend_rate_delete",
+            "description": "Deletes an existing rate"
+        },
+        {
+            "name": "backend_rate_get",
+            "description": "Returns a specific rate"
+        },
+        {
+            "name": "backend_rate_getAll",
+            "description": "Returns a paginated list of rate limitations"
+        },
+        {
+            "name": "backend_rate_update",
+            "description": "Updates an existing rate"
+        },
+        {
+            "name": "backend_role_create",
+            "description": "Creates a new role"
+        },
+        {
+            "name": "backend_role_delete",
+            "description": "Deletes an existing role"
+        },
+        {
+            "name": "backend_role_get",
+            "description": "Returns a specific role"
+        },
+        {
+            "name": "backend_role_getAll",
+            "description": "Returns a paginated list of roles"
+        },
+        {
+            "name": "backend_role_update",
+            "description": "Updates an existing role"
+        },
+        {
+            "name": "backend_schema_create",
+            "description": "Creates a new schema"
+        },
+        {
+            "name": "backend_schema_delete",
+            "description": "Deletes an existing schema"
+        },
+        {
+            "name": "backend_schema_get",
+            "description": "Returns a specific schema"
+        },
+        {
+            "name": "backend_schema_getAll",
+            "description": "Returns a paginated list of schemas"
+        },
+        {
+            "name": "backend_schema_getCommits",
+            "description": "Returns a paginated list of schema commits"
+        },
+        {
+            "name": "backend_schema_getPreview",
+            "description": "Returns a HTML preview of the provided schema"
+        },
+        {
+            "name": "backend_schema_update",
+            "description": "Updates an existing schema"
+        },
+        {
+            "name": "backend_schema_updateForm",
+            "description": "Updates an existing schema form"
+        },
+        {
+            "name": "backend_scope_create",
+            "description": "Creates a new scope"
+        },
+        {
+            "name": "backend_scope_delete",
+            "description": "Deletes an existing scope"
+        },
+        {
+            "name": "backend_scope_get",
+            "description": "Returns a specific scope"
+        },
+        {
+            "name": "backend_scope_getAll",
+            "description": "Returns a paginated list of scopes"
+        },
+        {
+            "name": "backend_scope_getCategories",
+            "description": "Returns all available scopes grouped by category"
+        },
+        {
+            "name": "backend_scope_update",
+            "description": "Updates an existing scope"
+        },
+        {
+            "name": "backend_sdk_generate",
+            "description": "Generates a specific SDK"
+        },
+        {
+            "name": "backend_sdk_getAll",
+            "description": "Returns a paginated list of SDKs"
+        },
+        {
+            "name": "backend_statistic_getActivitiesPerUser",
+            "description": "Returns a statistic containing the activities per user"
+        },
+        {
+            "name": "backend_statistic_getCountRequests",
+            "description": "Returns a statistic containing the request count"
+        },
+        {
+            "name": "backend_statistic_getErrorsPerOperation",
+            "description": "Returns a statistic containing the errors per operation"
+        },
+        {
+            "name": "backend_statistic_getIncomingRequests",
+            "description": "Returns a statistic containing the incoming requests"
+        },
+        {
+            "name": "backend_statistic_getIncomingTransactions",
+            "description": "Returns a statistic containing the incoming transactions"
+        },
+        {
+            "name": "backend_statistic_getIssuedTokens",
+            "description": "Returns a statistic containing the issues tokens"
+        },
+        {
+            "name": "backend_statistic_getMostUsedActivities",
+            "description": "Returns a statistic containing the most used activities"
+        },
+        {
+            "name": "backend_statistic_getMostUsedApps",
+            "description": "Returns a statistic containing the most used apps"
+        },
+        {
+            "name": "backend_statistic_getMostUsedOperations",
+            "description": "Returns a statistic containing the most used operations"
+        },
+        {
+            "name": "backend_statistic_getRequestsPerIP",
+            "description": "Returns a statistic containing the requests per ip"
+        },
+        {
+            "name": "backend_statistic_getRequestsPerOperation",
+            "description": "Returns a statistic containing the requests per operation"
+        },
+        {
+            "name": "backend_statistic_getRequestsPerUser",
+            "description": "Returns a statistic containing the requests per user"
+        },
+        {
+            "name": "backend_statistic_getTestCoverage",
+            "description": "Returns a statistic containing the test coverage"
+        },
+        {
+            "name": "backend_statistic_getTimeAverage",
+            "description": "Returns a statistic containing the time average"
+        },
+        {
+            "name": "backend_statistic_getTimePerOperation",
+            "description": "Returns a statistic containing the time per operation"
+        },
+        {
+            "name": "backend_statistic_getUsedPoints",
+            "description": "Returns a statistic containing the used points"
+        },
+        {
+            "name": "backend_statistic_getUserRegistrations",
+            "description": "Returns a statistic containing the user registrations"
+        },
+        {
+            "name": "backend_taxonomy_create",
+            "description": "Creates a new taxonomy"
+        },
+        {
+            "name": "backend_taxonomy_delete",
+            "description": "Deletes an existing taxonomy"
+        },
+        {
+            "name": "backend_taxonomy_get",
+            "description": "Returns a specific taxonomy"
+        },
+        {
+            "name": "backend_taxonomy_getAll",
+            "description": "Returns a paginated list of taxonomies"
+        },
+        {
+            "name": "backend_taxonomy_move",
+            "description": "Moves the provided ids to the taxonomy"
+        },
+        {
+            "name": "backend_taxonomy_update",
+            "description": "Updates an existing taxonomy"
+        },
+        {
+            "name": "backend_tenant_remove",
+            "description": "Removes an existing tenant"
+        },
+        {
+            "name": "backend_tenant_setup",
+            "description": "Setup a new tenant"
+        },
+        {
+            "name": "backend_test_get",
+            "description": "Returns a specific test"
+        },
+        {
+            "name": "backend_test_getAll",
+            "description": "Returns a paginated list of tests"
+        },
+        {
+            "name": "backend_test_refresh",
+            "description": "Refresh all tests"
+        },
+        {
+            "name": "backend_test_run",
+            "description": "Run all tests"
+        },
+        {
+            "name": "backend_test_update",
+            "description": "Updates an existing test"
+        },
+        {
+            "name": "backend_token_get",
+            "description": "Returns a specific token"
+        },
+        {
+            "name": "backend_token_getAll",
+            "description": "Returns a paginated list of tokens"
+        },
+        {
+            "name": "backend_transaction_get",
+            "description": "Returns a specific transaction"
+        },
+        {
+            "name": "backend_transaction_getAll",
+            "description": "Returns a paginated list of transactions"
+        },
+        {
+            "name": "backend_trash_getAllByType",
+            "description": "Returns all deleted records by trash type"
+        },
+        {
+            "name": "backend_trash_getTypes",
+            "description": "Returns all trash types"
+        },
+        {
+            "name": "backend_trash_restore",
+            "description": "Restores a previously deleted record"
+        },
+        {
+            "name": "backend_trigger_create",
+            "description": "Creates a new trigger"
+        },
+        {
+            "name": "backend_trigger_delete",
+            "description": "Deletes an existing trigger"
+        },
+        {
+            "name": "backend_trigger_get",
+            "description": "Returns a specific trigger"
+        },
+        {
+            "name": "backend_trigger_getAll",
+            "description": "Returns a paginated list of triggers"
+        },
+        {
+            "name": "backend_trigger_update",
+            "description": "Updates an existing trigger"
+        },
+        {
+            "name": "backend_user_create",
+            "description": "Creates a new user"
+        },
+        {
+            "name": "backend_user_delete",
+            "description": "Deletes an existing user"
+        },
+        {
+            "name": "backend_user_get",
+            "description": "Returns a specific user"
+        },
+        {
+            "name": "backend_user_getAll",
+            "description": "Returns a paginated list of users"
+        },
+        {
+            "name": "backend_user_resend",
+            "description": "Resend the activation mail to the provided user"
+        },
+        {
+            "name": "backend_user_update",
+            "description": "Updates an existing user"
+        },
+        {
+            "name": "backend_webhook_create",
+            "description": "Creates a new webhook"
+        },
+        {
+            "name": "backend_webhook_delete",
+            "description": "Deletes an existing webhook"
+        },
+        {
+            "name": "backend_webhook_get",
+            "description": "Returns a specific webhook"
+        },
+        {
+            "name": "backend_webhook_getAll",
+            "description": "Returns a paginated list of webhooks"
+        },
+        {
+            "name": "backend_webhook_update",
+            "description": "Updates an existing webhook"
+        },
+        {
+            "name": "consumer_account_activate",
+            "description": "Activates an previously registered account through a token which was provided to the user via email"
+        },
+        {
+            "name": "consumer_account_authorize",
+            "description": "Authorizes the access of a specific app for the authenticated user"
+        },
+        {
+            "name": "consumer_account_changePassword",
+            "description": "Change the password for the authenticated user"
+        },
+        {
+            "name": "consumer_account_executePasswordReset",
+            "description": "Change the password after the password reset flow was started"
+        },
+        {
+            "name": "consumer_account_get",
+            "description": "Returns a user data for the authenticated user"
+        },
+        {
+            "name": "consumer_account_getApp",
+            "description": "Returns information about a specific app to start the OAuth2 authorization code flow"
+        },
+        {
+            "name": "consumer_account_login",
+            "description": "User login by providing a username and password"
+        },
+        {
+            "name": "consumer_account_refresh",
+            "description": "Refresh a previously obtained access token"
+        },
+        {
+            "name": "consumer_account_register",
+            "description": "Register a new user account"
+        },
+        {
+            "name": "consumer_account_requestPasswordReset",
+            "description": "Start the password reset flow"
+        },
+        {
+            "name": "consumer_account_update",
+            "description": "Updates user data for the authenticated user"
+        },
+        {
+            "name": "consumer_app_create",
+            "description": "Creates a new app for the authenticated user"
+        },
+        {
+            "name": "consumer_app_delete",
+            "description": "Deletes an existing app for the authenticated user"
+        },
+        {
+            "name": "consumer_app_get",
+            "description": "Returns a specific app for the authenticated user"
+        },
+        {
+            "name": "consumer_app_getAll",
+            "description": "Returns a paginated list of apps which are assigned to the authenticated user"
+        },
+        {
+            "name": "consumer_app_update",
+            "description": "Updates an existing app for the authenticated user"
+        },
+        {
+            "name": "consumer_event_get",
+            "description": "Returns a specific event for the authenticated user"
+        },
+        {
+            "name": "consumer_event_getAll",
+            "description": "Returns a paginated list of apps which are assigned to the authenticated user"
+        },
+        {
+            "name": "consumer_form_get",
+            "description": "Returns a specific form for the authenticated user"
+        },
+        {
+            "name": "consumer_form_getAll",
+            "description": "Returns a paginated list of forms which are relevant to the authenticated user"
+        },
+        {
+            "name": "consumer_grant_delete",
+            "description": "Deletes an existing grant for an app which was created by the authenticated user"
+        },
+        {
+            "name": "consumer_grant_getAll",
+            "description": "Returns a paginated list of grants which are assigned to the authenticated user"
+        },
+        {
+            "name": "consumer_identity_exchange",
+            "description": "Identity callback endpoint to exchange an access token"
+        },
+        {
+            "name": "consumer_identity_getAll",
+            "description": "Returns a paginated list of identities which are relevant to the authenticated user"
+        },
+        {
+            "name": "consumer_identity_redirect",
+            "description": "Redirect the user to the configured identity provider"
+        },
+        {
+            "name": "consumer_log_get",
+            "description": "Returns a specific log for the authenticated user"
+        },
+        {
+            "name": "consumer_log_getAll",
+            "description": "Returns a paginated list of logs which are assigned to the authenticated user"
+        },
+        {
+            "name": "consumer_page_get",
+            "description": "Returns a specific page for the authenticated user"
+        },
+        {
+            "name": "consumer_page_getAll",
+            "description": "Returns a paginated list of pages which are relevant to the authenticated user"
+        },
+        {
+            "name": "consumer_payment_checkout",
+            "description": "Start the checkout process for a specific plan"
+        },
+        {
+            "name": "consumer_payment_portal",
+            "description": "Generates a payment portal link for the authenticated user"
+        },
+        {
+            "name": "consumer_plan_get",
+            "description": "Returns a specific plan for the authenticated user"
+        },
+        {
+            "name": "consumer_plan_getAll",
+            "description": "Returns a paginated list of plans which are relevant to the authenticated user"
+        },
+        {
+            "name": "consumer_scope_getAll",
+            "description": "Returns a paginated list of scopes which are assigned to the authenticated user"
+        },
+        {
+            "name": "consumer_scope_getCategories",
+            "description": "Returns all scopes by category"
+        },
+        {
+            "name": "consumer_token_create",
+            "description": "Creates a new token for the authenticated user"
+        },
+        {
+            "name": "consumer_token_delete",
+            "description": "Deletes an existing token for the authenticated user"
+        },
+        {
+            "name": "consumer_token_get",
+            "description": "Returns a specific token for the authenticated user"
+        },
+        {
+            "name": "consumer_token_getAll",
+            "description": "Returns a paginated list of tokens which are assigned to the authenticated user"
+        },
+        {
+            "name": "consumer_token_update",
+            "description": "Updates an existing token for the authenticated user"
+        },
+        {
+            "name": "consumer_transaction_get",
+            "description": "Returns a specific transaction for the authenticated user"
+        },
+        {
+            "name": "consumer_transaction_getAll",
+            "description": "Returns a paginated list of transactions which are assigned to the authenticated user"
+        },
+        {
+            "name": "consumer_webhook_create",
+            "description": "Creates a new webhook for the authenticated user"
+        },
+        {
+            "name": "consumer_webhook_delete",
+            "description": "Deletes an existing webhook for the authenticated user"
+        },
+        {
+            "name": "consumer_webhook_get",
+            "description": "Returns a specific webhook for the authenticated user"
+        },
+        {
+            "name": "consumer_webhook_getAll",
+            "description": "Returns a paginated list of webhooks which are assigned to the authenticated user"
+        },
+        {
+            "name": "consumer_webhook_update",
+            "description": "Updates an existing webhook for the authenticated user"
+        },
+        {
+            "name": "meta_getAbout",
+            "description": "Returns meta information and links about the current installed Fusio version"
+        },
+        {
+            "name": "system_connection_callback",
+            "description": "Connection OAuth2 callback to authorize a connection"
+        },
+        {
+            "name": "system_meta_getAbout",
+            "description": "Returns meta information and links about the current installed Fusio version"
+        },
+        {
+            "name": "system_meta_getDebug",
+            "description": "Debug endpoint which returns the provided data"
+        },
+        {
+            "name": "system_meta_getHealth",
+            "description": "Health check endpoint which returns information about the health status of the system"
+        },
+        {
+            "name": "system_meta_getRoutes",
+            "description": "Returns all available routes"
+        },
+        {
+            "name": "system_meta_getSchema",
+            "description": "Returns details of a specific schema"
+        },
+        {
+            "name": "system_payment_webhook",
+            "description": "Payment webhook endpoint after successful purchase of a plan"
+        }
+    ]
+}
+JSON;
+
+        $this->assertEquals(200, $response->getStatusCode(), $body);
+        $this->assertJsonStringEqualsJsonString($expect, $body, $body);
+    }
+}
diff --git a/tests/Backend/Api/Backup/resource/export.json b/tests/Backend/Api/Backup/resource/export.json
index 5a2e03016..bffbf2857 100644
--- a/tests/Backend/Api/Backup/resource/export.json
+++ b/tests/Backend/Api/Backup/resource/export.json
@@ -258,6 +258,12 @@
     }
   ],
   "connection": [
+    {
+      "status": 1,
+      "name": "Agent",
+      "class": "Fusio.Impl.Tests.Adapter.Test.AgentConnection",
+      "config": {}
+    },
     {
       "status": 1,
       "name": "StarwarsSDK",
@@ -383,7 +389,7 @@
         {
           "id": 4,
           "rateId": 4,
-          "operationId": 265,
+          "operationId": 271,
           "authenticated": true
         }
       ]
@@ -400,7 +406,7 @@
         {
           "id": 3,
           "rateId": 3,
-          "operationId": 264
+          "operationId": 270
         }
       ]
     },
@@ -566,6 +572,7 @@
         "backend",
         "backend.account",
         "backend.action",
+        "backend.agent",
         "backend.app",
         "backend.audit",
         "backend.backup",
@@ -627,6 +634,7 @@
         "backend",
         "backend.account",
         "backend.action",
+        "backend.agent",
         "backend.app",
         "backend.audit",
         "backend.backup",
diff --git a/tests/Backend/Api/Connection/Agent/CollectionTest.php b/tests/Backend/Api/Connection/Agent/CollectionTest.php
new file mode 100644
index 000000000..c2f7bfeb7
--- /dev/null
+++ b/tests/Backend/Api/Connection/Agent/CollectionTest.php
@@ -0,0 +1,101 @@
+<?php
+/*
+ * Fusio - Self-Hosted API Management for Builders.
+ * For the current version and information visit <https://www.fusio-project.org/>
+ *
+ * Copyright (c) Christoph Kappestein <christoph.kappestein@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Fusio\Impl\Tests\Backend\Api\Connection\Agent;
+
+use Fusio\Impl\Tests\DbTestCase;
+
+/**
+ * CollectionTest
+ *
+ * @author  Christoph Kappestein <christoph.kappestein@gmail.com>
+ * @license http://www.apache.org/licenses/LICENSE-2.0
+ * @link    https://www.fusio-project.org
+ */
+class CollectionTest extends DbTestCase
+{
+    public function testGet()
+    {
+        $response = $this->sendRequest('/backend/connection/Agent/agent', 'GET', array(
+            'User-Agent'    => 'Fusio TestCase',
+            'Authorization' => 'Bearer da250526d583edabca8ac2f99e37ee39aa02a3c076c0edc6929095e20ca18dcf'
+        ));
+
+        $body = (string) $response->getBody();
+
+        $this->assertEquals(404, $response->getStatusCode(), $body);
+    }
+
+    public function testPost()
+    {
+        $response = $this->sendRequest('/backend/connection/Agent/agent', 'POST', array(
+            'User-Agent'    => 'Fusio TestCase',
+            'Authorization' => 'Bearer da250526d583edabca8ac2f99e37ee39aa02a3c076c0edc6929095e20ca18dcf'
+        ), json_encode([
+            'type' => 'text',
+            'content' => 'What is the meaning of life?',
+        ]));
+
+        $body = (string) $response->getBody();
+
+        $expect = <<<JSON
+{
+    "type": "text",
+    "content": "The answer ist: 42"
+}
+JSON;
+
+        $this->assertEquals(200, $response->getStatusCode(), $body);
+        $this->assertJsonStringEqualsJsonString($expect, $body, $body);
+    }
+
+    public function testPut()
+    {
+        $response = $this->sendRequest('/backend/connection/Agent/agent', 'PUT', array(
+            'User-Agent'    => 'Fusio TestCase',
+            'Authorization' => 'Bearer da250526d583edabca8ac2f99e37ee39aa02a3c076c0edc6929095e20ca18dcf'
+        ), json_encode([
+            'foo' => 'bar',
+        ]));
+
+        $body = (string) $response->getBody();
+
+        $this->assertEquals(404, $response->getStatusCode(), $body);
+    }
+
+    public function testDelete()
+    {
+        $response = $this->sendRequest('/backend/connection/Agent/agent', 'DELETE', array(
+            'User-Agent'    => 'Fusio TestCase',
+            'Authorization' => 'Bearer da250526d583edabca8ac2f99e37ee39aa02a3c076c0edc6929095e20ca18dcf'
+        ), json_encode([
+            'foo' => 'bar',
+        ]));
+
+        $body = (string) $response->getBody();
+
+        $this->assertEquals(404, $response->getStatusCode(), $body);
+    }
+
+    protected function isTransactional(): bool
+    {
+        return false;
+    }
+}
diff --git a/tests/Backend/Api/Connection/CollectionTest.php b/tests/Backend/Api/Connection/CollectionTest.php
index 1f31e0551..2296c2aaa 100644
--- a/tests/Backend/Api/Connection/CollectionTest.php
+++ b/tests/Backend/Api/Connection/CollectionTest.php
@@ -44,10 +44,16 @@ public function testGet()
         $body   = (string) $response->getBody();
         $expect = <<<'JSON'
 {
-    "totalResults": 7,
+    "totalResults": 8,
     "startIndex": 0,
     "itemsPerPage": 16,
     "entry": [
+        {
+            "id": 8,
+            "status": 1,
+            "name": "Agent",
+            "class": "Fusio.Impl.Tests.Adapter.Test.AgentConnection"
+        },
         {
             "id": 7,
             "status": 1,
@@ -207,10 +213,16 @@ public function testGetCount()
         $body   = (string) $response->getBody();
         $expect = <<<'JSON'
 {
-    "totalResults": 7,
+    "totalResults": 8,
     "startIndex": 0,
     "itemsPerPage": 80,
     "entry": [
+        {
+            "id": 8,
+            "status": 1,
+            "name": "Agent",
+            "class": "Fusio.Impl.Tests.Adapter.Test.AgentConnection"
+        },
         {
             "id": 7,
             "status": 1,
@@ -289,7 +301,7 @@ public function testPost()
 {
     "success": true,
     "message": "Connection successfully created",
-    "id": "8"
+    "id": "9"
 }
 JSON;
 
@@ -307,7 +319,7 @@ public function testPost()
 
         $row = $this->connection->fetchAssociative($sql);
 
-        $this->assertEquals(8, $row['id']);
+        $this->assertEquals(9, $row['id']);
         $this->assertEquals('Foo', $row['name']);
         $this->assertEquals(ClassName::serialize(SqlAdvanced::class), $row['class']);
         $this->assertNotEmpty($row['config']);
diff --git a/tests/Backend/Api/Connection/Database/Table/CollectionTest.php b/tests/Backend/Api/Connection/Database/Table/CollectionTest.php
index 09c54892b..bc7b0bb70 100644
--- a/tests/Backend/Api/Connection/Database/Table/CollectionTest.php
+++ b/tests/Backend/Api/Connection/Database/Table/CollectionTest.php
@@ -42,7 +42,7 @@ public function testGet()
         $body   = (string) $response->getBody();
         $expect = <<<'JSON'
 {
-    "totalResults": 48,
+    "totalResults": 49,
     "itemsPerPage": 16,
     "startIndex": 0,
     "entry": [
@@ -61,6 +61,9 @@ public function testGet()
         {
             "name": "fusio_agent"
         },
+        {
+            "name": "fusio_agent_message"
+        },
         {
             "name": "fusio_app"
         },
@@ -90,9 +93,6 @@ public function testGet()
         },
         {
             "name": "fusio_cronjob_error"
-        },
-        {
-            "name": "fusio_event"
         }
     ]
 }
diff --git a/tests/Backend/Api/Connection/ListTest.php b/tests/Backend/Api/Connection/ListTest.php
index 1643c4c93..0d117d77e 100644
--- a/tests/Backend/Api/Connection/ListTest.php
+++ b/tests/Backend/Api/Connection/ListTest.php
@@ -50,6 +50,10 @@ public function testGet()
             "name": "Agent",
             "class": "Fusio.Adapter.Ai.Connection.Agent"
         },
+        {
+            "name": "Agent-Connection",
+            "class": "Fusio.Impl.Tests.Adapter.Test.AgentConnection"
+        },
         {
             "name": "Beanstalk",
             "class": "Fusio.Adapter.Beanstalk.Connection.Beanstalk"
diff --git a/tests/Backend/Api/Event/CollectionTest.php b/tests/Backend/Api/Event/CollectionTest.php
index f4a29a1d0..d6026113e 100644
--- a/tests/Backend/Api/Event/CollectionTest.php
+++ b/tests/Backend/Api/Event/CollectionTest.php
@@ -21,6 +21,7 @@
 namespace Fusio\Impl\Tests\Backend\Api\Event;
 
 use Fusio\Impl\Tests\DbTestCase;
+use Fusio\Impl\Tests\Fixture;
 
 /**
  * CollectionTest
@@ -31,6 +32,17 @@
  */
 class CollectionTest extends DbTestCase
 {
+    private ?int $eventFooId = null;
+    private ?int $eventSecondId = null;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->eventFooId = Fixture::getReference('fusio_event', 'foo-event')->resolve($this->connection);
+        $this->eventSecondId = Fixture::getReference('fusio_event', 'second-event')->resolve($this->connection);
+    }
+
     public function testGet()
     {
         $response = $this->sendRequest('/backend/event', 'GET', array(
@@ -39,14 +51,14 @@ public function testGet()
         ));
 
         $body   = (string) $response->getBody();
-        $expect = <<<'JSON'
+        $expect = <<<JSON
 {
     "totalResults": 1,
     "startIndex": 0,
     "itemsPerPage": 16,
     "entry": [
         {
-            "id": 72,
+            "id": {$this->eventFooId},
             "status": 1,
             "name": "foo-event",
             "description": "Foo event description",
@@ -70,14 +82,14 @@ public function testGetSearch()
         ));
 
         $body   = (string) $response->getBody();
-        $expect = <<<'JSON'
+        $expect = <<<JSON
 {
     "totalResults": 1,
     "startIndex": 0,
     "itemsPerPage": 16,
     "entry": [
         {
-            "id": 72,
+            "id": {$this->eventFooId},
             "status": 1,
             "name": "foo-event",
             "description": "Foo event description",
@@ -101,14 +113,14 @@ public function testGetTaxonomy()
         ));
 
         $body   = (string) $response->getBody();
-        $expect = <<<'JSON'
+        $expect = <<<JSON
 {
     "totalResults": 1,
     "startIndex": 0,
     "itemsPerPage": 16,
     "entry": [
         {
-            "id": 73,
+            "id": {$this->eventSecondId},
             "status": 1,
             "name": "second-event",
             "description": "Foo event description",
@@ -132,14 +144,14 @@ public function testGetCount()
         ));
 
         $body   = (string) $response->getBody();
-        $expect = <<<'JSON'
+        $expect = <<<JSON
 {
     "totalResults": 1,
     "startIndex": 0,
     "itemsPerPage": 80,
     "entry": [
         {
-            "id": 72,
+            "id": {$this->eventFooId},
             "status": 1,
             "name": "foo-event",
             "description": "Foo event description",
@@ -176,7 +188,7 @@ public function testPost()
 {
     "success": true,
     "message": "Event successfully created",
-    "id": "74"
+    "id": "77"
 }
 JSON;
 
@@ -194,7 +206,7 @@ public function testPost()
 
         $row = $this->connection->fetchAssociative($sql);
 
-        $this->assertEquals(74, $row['id']);
+        $this->assertEquals(77, $row['id']);
         $this->assertEquals(1, $row['status']);
         $this->assertEquals('bar-event', $row['name']);
         $this->assertEquals('Test description', $row['description']);
diff --git a/tests/Backend/Api/Event/EntityTest.php b/tests/Backend/Api/Event/EntityTest.php
index e8a5e6916..fdb94edf8 100644
--- a/tests/Backend/Api/Event/EntityTest.php
+++ b/tests/Backend/Api/Event/EntityTest.php
@@ -138,7 +138,7 @@ public function testPut()
 {
     "success": true,
     "message": "Event successfully updated",
-    "id": "72"
+    "id": "75"
 }
 JSON;
 
@@ -171,7 +171,7 @@ public function testDelete()
 {
     "success": true,
     "message": "Event successfully deleted",
-    "id": "72"
+    "id": "75"
 }
 JSON;
 
diff --git a/tests/Backend/Api/Form/CollectionTest.php b/tests/Backend/Api/Form/CollectionTest.php
index 834af9840..03185907a 100644
--- a/tests/Backend/Api/Form/CollectionTest.php
+++ b/tests/Backend/Api/Form/CollectionTest.php
@@ -50,7 +50,7 @@ public function testGet()
             "id": 1,
             "status": 1,
             "name": "my_form",
-            "operationId": 265,
+            "operationId": 271,
             "metadata": {
                 "foo": "bar"
             }
diff --git a/tests/Backend/Api/Form/EntityTest.php b/tests/Backend/Api/Form/EntityTest.php
index 3e4b0bee8..7e2ce53e8 100644
--- a/tests/Backend/Api/Form/EntityTest.php
+++ b/tests/Backend/Api/Form/EntityTest.php
@@ -54,7 +54,7 @@ public function testGet()
     "id": 1,
     "status": 1,
     "name": "my_form",
-    "operationId": 265,
+    "operationId": 271,
     "uiSchema": {
         "foo": "bar"
     },
@@ -81,7 +81,7 @@ public function testGetByName()
     "id": 1,
     "status": 1,
     "name": "my_form",
-    "operationId": 265,
+    "operationId": 271,
     "uiSchema": {
         "foo": "bar"
     },
diff --git a/tests/Backend/Api/Generator/SqlDatabaseTest.php b/tests/Backend/Api/Generator/SqlDatabaseTest.php
index 1fbd47283..57a77b772 100644
--- a/tests/Backend/Api/Generator/SqlDatabaseTest.php
+++ b/tests/Backend/Api/Generator/SqlDatabaseTest.php
@@ -68,6 +68,10 @@ protected function getExpectForm(): string
             "title": "Connection",
             "help": "The SQL connection which should be used",
             "options": [
+                {
+                    "key": "8",
+                    "value": "Agent"
+                },
                 {
                     "key": "6",
                     "value": "FusioHttpClient"
diff --git a/tests/Backend/Api/Generator/SqlEntityTest.php b/tests/Backend/Api/Generator/SqlEntityTest.php
index d43e72c7d..59c9cba3e 100644
--- a/tests/Backend/Api/Generator/SqlEntityTest.php
+++ b/tests/Backend/Api/Generator/SqlEntityTest.php
@@ -78,6 +78,10 @@ protected function getExpectForm(): string
             "title": "Connection",
             "help": "The SQL connection which should be used",
             "options": [
+                {
+                    "key": "8",
+                    "value": "Agent"
+                },
                 {
                     "key": "6",
                     "value": "FusioHttpClient"
diff --git a/tests/Backend/Api/Generator/SqlTableTest.php b/tests/Backend/Api/Generator/SqlTableTest.php
index 708a09df4..e44432902 100644
--- a/tests/Backend/Api/Generator/SqlTableTest.php
+++ b/tests/Backend/Api/Generator/SqlTableTest.php
@@ -68,6 +68,10 @@ protected function getExpectForm(): string
             "title": "Connection",
             "help": "The SQL connection which should be used",
             "options": [
+                {
+                    "key": "8",
+                    "value": "Agent"
+                },
                 {
                     "key": "6",
                     "value": "FusioHttpClient"
diff --git a/tests/Backend/Api/Log/EntityTest.php b/tests/Backend/Api/Log/EntityTest.php
index 5b03d0bc1..ab2fa1849 100644
--- a/tests/Backend/Api/Log/EntityTest.php
+++ b/tests/Backend/Api/Log/EntityTest.php
@@ -44,7 +44,7 @@ public function testGet()
 {
     "id": 1,
     "appId": 3,
-    "operationId": 264,
+    "operationId": 270,
     "ip": "127.0.0.1",
     "userAgent": "Mozilla\/5.0 (Windows NT 6.3; WOW64) AppleWebKit\/537.36 (KHTML, like Gecko) Chrome\/43.0.2357.130 Safari\/537.36",
     "method": "GET",
diff --git a/tests/Backend/Api/Operation/CollectionTest.php b/tests/Backend/Api/Operation/CollectionTest.php
index 81fd59437..0e94fb7bf 100644
--- a/tests/Backend/Api/Operation/CollectionTest.php
+++ b/tests/Backend/Api/Operation/CollectionTest.php
@@ -49,7 +49,7 @@ public function testGet()
     "itemsPerPage": 16,
     "entry": [
         {
-            "id": 276,
+            "id": 282,
             "status": 1,
             "active": true,
             "public": false,
@@ -61,7 +61,7 @@ public function testGet()
             "action": "action:\/\/MIME-Action"
         },
         {
-            "id": 275,
+            "id": 281,
             "status": 1,
             "active": true,
             "public": false,
@@ -73,7 +73,7 @@ public function testGet()
             "action": "action:\/\/MIME-Action"
         },
         {
-            "id": 274,
+            "id": 280,
             "status": 1,
             "active": true,
             "public": false,
@@ -85,7 +85,7 @@ public function testGet()
             "action": "action:\/\/MIME-Action"
         },
         {
-            "id": 273,
+            "id": 279,
             "status": 1,
             "active": true,
             "public": false,
@@ -97,7 +97,7 @@ public function testGet()
             "action": "action:\/\/MIME-Action"
         },
         {
-            "id": 272,
+            "id": 278,
             "status": 1,
             "active": true,
             "public": false,
@@ -109,7 +109,7 @@ public function testGet()
             "action": "action:\/\/MIME-Action"
         },
         {
-            "id": 271,
+            "id": 277,
             "status": 1,
             "active": true,
             "public": false,
@@ -121,7 +121,7 @@ public function testGet()
             "action": "action:\/\/MIME-Action"
         },
         {
-            "id": 270,
+            "id": 276,
             "status": 1,
             "active": true,
             "public": false,
@@ -133,7 +133,7 @@ public function testGet()
             "action": "action:\/\/Inspect-Action"
         },
         {
-            "id": 269,
+            "id": 275,
             "status": 1,
             "active": true,
             "public": false,
@@ -145,7 +145,7 @@ public function testGet()
             "action": "action:\/\/Inspect-Action"
         },
         {
-            "id": 268,
+            "id": 274,
             "status": 1,
             "active": true,
             "public": false,
@@ -157,7 +157,7 @@ public function testGet()
             "action": "action:\/\/Inspect-Action"
         },
         {
-            "id": 267,
+            "id": 273,
             "status": 1,
             "active": true,
             "public": false,
@@ -169,7 +169,7 @@ public function testGet()
             "action": "action:\/\/Inspect-Action"
         },
         {
-            "id": 266,
+            "id": 272,
             "status": 1,
             "active": true,
             "public": false,
@@ -181,7 +181,7 @@ public function testGet()
             "action": "action:\/\/Inspect-Action"
         },
         {
-            "id": 265,
+            "id": 271,
             "status": 1,
             "active": true,
             "public": false,
@@ -227,7 +227,7 @@ public function testGetSearch()
     "itemsPerPage": 16,
     "entry": [
         {
-            "id": 270,
+            "id": 276,
             "status": 1,
             "active": true,
             "public": false,
@@ -239,7 +239,7 @@ public function testGetSearch()
             "action": "action:\/\/Inspect-Action"
         },
         {
-            "id": 269,
+            "id": 275,
             "status": 1,
             "active": true,
             "public": false,
@@ -251,7 +251,7 @@ public function testGetSearch()
             "action": "action:\/\/Inspect-Action"
         },
         {
-            "id": 268,
+            "id": 274,
             "status": 1,
             "active": true,
             "public": false,
@@ -263,7 +263,7 @@ public function testGetSearch()
             "action": "action:\/\/Inspect-Action"
         },
         {
-            "id": 267,
+            "id": 273,
             "status": 1,
             "active": true,
             "public": false,
@@ -275,7 +275,7 @@ public function testGetSearch()
             "action": "action:\/\/Inspect-Action"
         },
         {
-            "id": 266,
+            "id": 272,
             "status": 1,
             "active": true,
             "public": false,
@@ -309,7 +309,7 @@ public function testGetTaxonomy()
     "itemsPerPage": 16,
     "entry": [
         {
-            "id": 264,
+            "id": 270,
             "status": 1,
             "active": true,
             "public": true,
@@ -343,7 +343,7 @@ public function testGetCount()
     "itemsPerPage": 80,
     "entry": [
         {
-            "id": 276,
+            "id": 282,
             "status": 1,
             "active": true,
             "public": false,
@@ -355,7 +355,7 @@ public function testGetCount()
             "action": "action:\/\/MIME-Action"
         },
         {
-            "id": 275,
+            "id": 281,
             "status": 1,
             "active": true,
             "public": false,
@@ -367,7 +367,7 @@ public function testGetCount()
             "action": "action:\/\/MIME-Action"
         },
         {
-            "id": 274,
+            "id": 280,
             "status": 1,
             "active": true,
             "public": false,
@@ -379,7 +379,7 @@ public function testGetCount()
             "action": "action:\/\/MIME-Action"
         },
         {
-            "id": 273,
+            "id": 279,
             "status": 1,
             "active": true,
             "public": false,
@@ -391,7 +391,7 @@ public function testGetCount()
             "action": "action:\/\/MIME-Action"
         },
         {
-            "id": 272,
+            "id": 278,
             "status": 1,
             "active": true,
             "public": false,
@@ -403,7 +403,7 @@ public function testGetCount()
             "action": "action:\/\/MIME-Action"
         },
         {
-            "id": 271,
+            "id": 277,
             "status": 1,
             "active": true,
             "public": false,
@@ -415,7 +415,7 @@ public function testGetCount()
             "action": "action:\/\/MIME-Action"
         },
         {
-            "id": 270,
+            "id": 276,
             "status": 1,
             "active": true,
             "public": false,
@@ -427,7 +427,7 @@ public function testGetCount()
             "action": "action:\/\/Inspect-Action"
         },
         {
-            "id": 269,
+            "id": 275,
             "status": 1,
             "active": true,
             "public": false,
@@ -439,7 +439,7 @@ public function testGetCount()
             "action": "action:\/\/Inspect-Action"
         },
         {
-            "id": 268,
+            "id": 274,
             "status": 1,
             "active": true,
             "public": false,
@@ -451,7 +451,7 @@ public function testGetCount()
             "action": "action:\/\/Inspect-Action"
         },
         {
-            "id": 267,
+            "id": 273,
             "status": 1,
             "active": true,
             "public": false,
@@ -463,7 +463,7 @@ public function testGetCount()
             "action": "action:\/\/Inspect-Action"
         },
         {
-            "id": 266,
+            "id": 272,
             "status": 1,
             "active": true,
             "public": false,
@@ -475,7 +475,7 @@ public function testGetCount()
             "action": "action:\/\/Inspect-Action"
         },
         {
-            "id": 265,
+            "id": 271,
             "status": 1,
             "active": true,
             "public": false,
@@ -544,7 +544,7 @@ public function testPost()
 {
     "success": true,
     "message": "Operation successfully created",
-    "id": "277"
+    "id": "283"
 }
 JSON;
 
@@ -594,7 +594,7 @@ public function testPostWithScheme()
         $this->assertEquals(201, $response->getStatusCode(), $body);
         $this->assertSame(true, $data->success);
         $this->assertSame('Operation successfully created', $data->message);
-        $this->assertContains($data->id, ['277', '278']); // postgres does not reset the auto increment so we need to check both
+        $this->assertContains($data->id, ['283', '284']); // postgres does not reset the auto increment so we need to check both
 
         // check database
         Assert::assertOperation($this->connection, OperationInterface::STABILITY_EXPERIMENTAL, 'test.bar', 'GET', '/foo/bar', 200, ['foo', 'baz'], $metadata);
diff --git a/tests/Backend/Api/Operation/EntityTest.php b/tests/Backend/Api/Operation/EntityTest.php
index 7468fefc9..5923e92f8 100644
--- a/tests/Backend/Api/Operation/EntityTest.php
+++ b/tests/Backend/Api/Operation/EntityTest.php
@@ -54,7 +54,7 @@ public function testGet()
         $body   = (string) $response->getBody();
         $expect = <<<JSON
 {
-    "id": 264,
+    "id": 270,
     "status": 1,
     "name": "test.listFoo",
     "scopes": [
@@ -96,7 +96,7 @@ public function testGetByName()
         $body   = (string) $response->getBody();
         $expect = <<<JSON
 {
-    "id": 264,
+    "id": 270,
     "status": 1,
     "name": "test.listFoo",
     "scopes": [
@@ -195,7 +195,7 @@ public function testPut()
 {
     "success": true,
     "message": "Operation successfully updated",
-    "id": "264"
+    "id": "270"
 }
 JSON;
 
@@ -243,7 +243,7 @@ public function testPutStable()
 {
     "success": true,
     "message": "Operation successfully updated",
-    "id": "265"
+    "id": "271"
 }
 JSON;
 
@@ -266,7 +266,7 @@ public function testDelete()
 {
     "success": true,
     "message": "Operation successfully deleted",
-    "id": "264"
+    "id": "270"
 }
 JSON;
 
diff --git a/tests/Backend/Api/Plan/CollectionTest.php b/tests/Backend/Api/Plan/CollectionTest.php
index 69be48d07..3f41744e7 100644
--- a/tests/Backend/Api/Plan/CollectionTest.php
+++ b/tests/Backend/Api/Plan/CollectionTest.php
@@ -138,7 +138,7 @@ public function testPost()
         $result = $this->connection->fetchAllAssociative($sql, ['plan_id' => $row['id']]);
 
         $this->assertEquals(1, count($result));
-        $this->assertEquals(57, $result[0]['scope_id']);
+        $this->assertEquals(58, $result[0]['scope_id']);
     }
 
     public function testPut()
diff --git a/tests/Backend/Api/Plan/EntityTest.php b/tests/Backend/Api/Plan/EntityTest.php
index b454db592..4a83584d1 100644
--- a/tests/Backend/Api/Plan/EntityTest.php
+++ b/tests/Backend/Api/Plan/EntityTest.php
@@ -180,7 +180,7 @@ public function testPut()
         $result = $this->connection->fetchAllAssociative($sql, ['plan_id' => 1]);
 
         $this->assertEquals(1, count($result));
-        $this->assertEquals(58, $result[0]['scope_id']);
+        $this->assertEquals(59, $result[0]['scope_id']);
     }
 
     public function testDelete()
diff --git a/tests/Backend/Api/Role/CollectionTest.php b/tests/Backend/Api/Role/CollectionTest.php
index 7838ae651..045b863cf 100644
--- a/tests/Backend/Api/Role/CollectionTest.php
+++ b/tests/Backend/Api/Role/CollectionTest.php
@@ -188,7 +188,7 @@ public function testPost()
 
         $this->assertEquals(2, count($result));
         $this->assertEquals(7, $result[0]['scope_id']);
-        $this->assertEquals(29, $result[1]['scope_id']);
+        $this->assertEquals(30, $result[1]['scope_id']);
     }
 
     public function testPut()
diff --git a/tests/Backend/Api/Scope/CategoriesTest.php b/tests/Backend/Api/Scope/CategoriesTest.php
index df213eb0d..39cdd3897 100644
--- a/tests/Backend/Api/Scope/CategoriesTest.php
+++ b/tests/Backend/Api/Scope/CategoriesTest.php
@@ -79,171 +79,176 @@ public function testGet()
                 },
                 {
                     "id": 8,
-                    "name": "backend.app",
+                    "name": "backend.agent",
                     "description": ""
                 },
                 {
                     "id": 9,
+                    "name": "backend.app",
+                    "description": ""
+                },
+                {
+                    "id": 10,
                     "name": "backend.audit",
                     "description": ""
                 },
                 {
-                    "id": 16,
+                    "id": 17,
                     "name": "backend.backup",
                     "description": ""
                 },
                 {
-                    "id": 23,
+                    "id": 24,
                     "name": "backend.bundle",
                     "description": ""
                 },
                 {
-                    "id": 10,
+                    "id": 11,
                     "name": "backend.category",
                     "description": ""
                 },
                 {
-                    "id": 11,
+                    "id": 12,
                     "name": "backend.config",
                     "description": ""
                 },
                 {
-                    "id": 12,
+                    "id": 13,
                     "name": "backend.connection",
                     "description": ""
                 },
                 {
-                    "id": 13,
+                    "id": 14,
                     "name": "backend.cronjob",
                     "description": ""
                 },
                 {
-                    "id": 14,
+                    "id": 15,
                     "name": "backend.dashboard",
                     "description": ""
                 },
                 {
-                    "id": 15,
+                    "id": 16,
                     "name": "backend.event",
                     "description": ""
                 },
                 {
-                    "id": 17,
+                    "id": 18,
                     "name": "backend.firewall",
                     "description": ""
                 },
                 {
-                    "id": 18,
+                    "id": 19,
                     "name": "backend.form",
                     "description": ""
                 },
                 {
-                    "id": 19,
+                    "id": 20,
                     "name": "backend.generator",
                     "description": ""
                 },
                 {
-                    "id": 20,
+                    "id": 21,
                     "name": "backend.identity",
                     "description": ""
                 },
                 {
-                    "id": 21,
+                    "id": 22,
                     "name": "backend.log",
                     "description": ""
                 },
                 {
-                    "id": 22,
+                    "id": 23,
                     "name": "backend.marketplace",
                     "description": ""
                 },
                 {
-                    "id": 28,
+                    "id": 29,
                     "name": "backend.operation",
                     "description": ""
                 },
                 {
-                    "id": 24,
+                    "id": 25,
                     "name": "backend.page",
                     "description": ""
                 },
                 {
-                    "id": 25,
+                    "id": 26,
                     "name": "backend.plan",
                     "description": ""
                 },
                 {
-                    "id": 26,
+                    "id": 27,
                     "name": "backend.rate",
                     "description": ""
                 },
                 {
-                    "id": 27,
+                    "id": 28,
                     "name": "backend.role",
                     "description": ""
                 },
                 {
-                    "id": 29,
+                    "id": 30,
                     "name": "backend.schema",
                     "description": ""
                 },
                 {
-                    "id": 30,
+                    "id": 31,
                     "name": "backend.scope",
                     "description": ""
                 },
                 {
-                    "id": 31,
+                    "id": 32,
                     "name": "backend.sdk",
                     "description": ""
                 },
                 {
-                    "id": 32,
+                    "id": 33,
                     "name": "backend.statistic",
                     "description": ""
                 },
                 {
-                    "id": 36,
+                    "id": 37,
                     "name": "backend.taxonomy",
                     "description": ""
                 },
                 {
-                    "id": 33,
+                    "id": 34,
                     "name": "backend.tenant",
                     "description": ""
                 },
                 {
-                    "id": 34,
+                    "id": 35,
                     "name": "backend.test",
                     "description": ""
                 },
                 {
-                    "id": 35,
+                    "id": 36,
                     "name": "backend.token",
                     "description": ""
                 },
                 {
-                    "id": 37,
+                    "id": 38,
                     "name": "backend.transaction",
                     "description": ""
                 },
                 {
-                    "id": 38,
+                    "id": 39,
                     "name": "backend.trash",
                     "description": ""
                 },
                 {
-                    "id": 39,
+                    "id": 40,
                     "name": "backend.trigger",
                     "description": ""
                 },
                 {
-                    "id": 40,
+                    "id": 41,
                     "name": "backend.user",
                     "description": ""
                 },
                 {
-                    "id": 41,
+                    "id": 42,
                     "name": "backend.webhook",
                     "description": ""
                 }
@@ -259,72 +264,72 @@ public function testGet()
                     "description": ""
                 },
                 {
-                    "id": 54,
+                    "id": 55,
                     "name": "consumer.account",
                     "description": ""
                 },
                 {
-                    "id": 42,
+                    "id": 43,
                     "name": "consumer.app",
                     "description": ""
                 },
                 {
-                    "id": 43,
+                    "id": 44,
                     "name": "consumer.event",
                     "description": ""
                 },
                 {
-                    "id": 47,
+                    "id": 48,
                     "name": "consumer.form",
                     "description": ""
                 },
                 {
-                    "id": 44,
+                    "id": 45,
                     "name": "consumer.grant",
                     "description": ""
                 },
                 {
-                    "id": 55,
+                    "id": 56,
                     "name": "consumer.identity",
                     "description": ""
                 },
                 {
-                    "id": 45,
+                    "id": 46,
                     "name": "consumer.log",
                     "description": ""
                 },
                 {
-                    "id": 46,
+                    "id": 47,
                     "name": "consumer.page",
                     "description": ""
                 },
                 {
-                    "id": 48,
+                    "id": 49,
                     "name": "consumer.payment",
                     "description": ""
                 },
                 {
-                    "id": 49,
+                    "id": 50,
                     "name": "consumer.plan",
                     "description": ""
                 },
                 {
-                    "id": 50,
+                    "id": 51,
                     "name": "consumer.scope",
                     "description": ""
                 },
                 {
-                    "id": 51,
+                    "id": 52,
                     "name": "consumer.token",
                     "description": ""
                 },
                 {
-                    "id": 53,
+                    "id": 54,
                     "name": "consumer.transaction",
                     "description": ""
                 },
                 {
-                    "id": 52,
+                    "id": 53,
                     "name": "consumer.webhook",
                     "description": ""
                 }
@@ -335,7 +340,7 @@ public function testGet()
             "name": "default",
             "scopes": [
                 {
-                    "id": 58,
+                    "id": 59,
                     "name": "bar",
                     "description": "Bar access"
                 },
@@ -345,12 +350,12 @@ public function testGet()
                     "description": ""
                 },
                 {
-                    "id": 57,
+                    "id": 58,
                     "name": "foo",
                     "description": "Foo access"
                 },
                 {
-                    "id": 59,
+                    "id": 60,
                     "name": "plan_scope",
                     "description": "Plan scope access"
                 }
@@ -361,7 +366,7 @@ public function testGet()
             "name": "system",
             "scopes": [
                 {
-                    "id": 56,
+                    "id": 57,
                     "name": "system",
                     "description": ""
                 }
diff --git a/tests/Backend/Api/Scope/CollectionTest.php b/tests/Backend/Api/Scope/CollectionTest.php
index c40d3ec01..27ce5e33e 100644
--- a/tests/Backend/Api/Scope/CollectionTest.php
+++ b/tests/Backend/Api/Scope/CollectionTest.php
@@ -47,17 +47,17 @@ public function testGet()
     "itemsPerPage": 16,
     "entry": [
         {
-            "id": 59,
+            "id": 60,
             "name": "plan_scope",
             "description": "Plan scope access"
         },
         {
-            "id": 58,
+            "id": 59,
             "name": "bar",
             "description": "Bar access"
         },
         {
-            "id": 57,
+            "id": 58,
             "name": "foo",
             "description": "Foo access",
             "metadata": {
@@ -92,7 +92,7 @@ public function testGetSearch()
     "itemsPerPage": 16,
     "entry": [
         {
-            "id": 57,
+            "id": 58,
             "name": "foo",
             "description": "Foo access",
             "metadata": {
@@ -122,17 +122,17 @@ public function testGetCount()
     "itemsPerPage": 80,
     "entry": [
         {
-            "id": 59,
+            "id": 60,
             "name": "plan_scope",
             "description": "Plan scope access"
         },
         {
-            "id": 58,
+            "id": 59,
             "name": "bar",
             "description": "Bar access"
         },
         {
-            "id": 57,
+            "id": 58,
             "name": "foo",
             "description": "Foo access",
             "metadata": {
@@ -209,11 +209,11 @@ public function testPost()
 
         $this->assertEquals([[
             'scope_id' => $scopeId,
-            'operation_id' => 266,
+            'operation_id' => 272,
             'allow' => 1,
         ], [
             'scope_id' => $scopeId,
-            'operation_id' => 264,
+            'operation_id' => 270,
             'allow' => 1,
         ]], $operations);
     }
diff --git a/tests/Backend/Api/Scope/EntityTest.php b/tests/Backend/Api/Scope/EntityTest.php
index ddf209f7f..08a9e3b1e 100644
--- a/tests/Backend/Api/Scope/EntityTest.php
+++ b/tests/Backend/Api/Scope/EntityTest.php
@@ -52,86 +52,86 @@ public function testGet()
         $body   = (string) $response->getBody();
         $expect = <<<JSON
 {
-    "id": 58,
+    "id": 59,
     "name": "bar",
     "description": "Bar access",
     "operations": [
         {
-            "id": 270,
-            "scopeId": 58,
-            "operationId": 276,
+            "id": 276,
+            "scopeId": 59,
+            "operationId": 282,
             "allow": true
         },
         {
-            "id": 269,
-            "scopeId": 58,
-            "operationId": 275,
+            "id": 275,
+            "scopeId": 59,
+            "operationId": 281,
             "allow": true
         },
         {
-            "id": 268,
-            "scopeId": 58,
-            "operationId": 274,
+            "id": 274,
+            "scopeId": 59,
+            "operationId": 280,
             "allow": true
         },
         {
-            "id": 267,
-            "scopeId": 58,
-            "operationId": 273,
+            "id": 273,
+            "scopeId": 59,
+            "operationId": 279,
             "allow": true
         },
         {
-            "id": 266,
-            "scopeId": 58,
-            "operationId": 272,
+            "id": 272,
+            "scopeId": 59,
+            "operationId": 278,
             "allow": true
         },
         {
-            "id": 265,
-            "scopeId": 58,
-            "operationId": 271,
+            "id": 271,
+            "scopeId": 59,
+            "operationId": 277,
             "allow": true
         },
         {
-            "id": 264,
-            "scopeId": 58,
-            "operationId": 270,
+            "id": 270,
+            "scopeId": 59,
+            "operationId": 276,
             "allow": true
         },
         {
-            "id": 263,
-            "scopeId": 58,
-            "operationId": 269,
+            "id": 269,
+            "scopeId": 59,
+            "operationId": 275,
             "allow": true
         },
         {
-            "id": 262,
-            "scopeId": 58,
-            "operationId": 268,
+            "id": 268,
+            "scopeId": 59,
+            "operationId": 274,
             "allow": true
         },
         {
-            "id": 261,
-            "scopeId": 58,
-            "operationId": 267,
+            "id": 267,
+            "scopeId": 59,
+            "operationId": 273,
             "allow": true
         },
         {
-            "id": 259,
-            "scopeId": 58,
-            "operationId": 266,
+            "id": 265,
+            "scopeId": 59,
+            "operationId": 272,
             "allow": true
         },
         {
-            "id": 257,
-            "scopeId": 58,
-            "operationId": 265,
+            "id": 263,
+            "scopeId": 59,
+            "operationId": 271,
             "allow": true
         },
         {
-            "id": 256,
-            "scopeId": 58,
-            "operationId": 264,
+            "id": 262,
+            "scopeId": 59,
+            "operationId": 270,
             "allow": true
         }
     ]
@@ -152,86 +152,86 @@ public function testGetByName()
         $body   = (string) $response->getBody();
         $expect = <<<JSON
 {
-    "id": 58,
+    "id": 59,
     "name": "bar",
     "description": "Bar access",
     "operations": [
         {
-            "id": 270,
-            "scopeId": 58,
-            "operationId": 276,
+            "id": 276,
+            "scopeId": 59,
+            "operationId": 282,
             "allow": true
         },
         {
-            "id": 269,
-            "scopeId": 58,
-            "operationId": 275,
+            "id": 275,
+            "scopeId": 59,
+            "operationId": 281,
             "allow": true
         },
         {
-            "id": 268,
-            "scopeId": 58,
-            "operationId": 274,
+            "id": 274,
+            "scopeId": 59,
+            "operationId": 280,
             "allow": true
         },
         {
-            "id": 267,
-            "scopeId": 58,
-            "operationId": 273,
+            "id": 273,
+            "scopeId": 59,
+            "operationId": 279,
             "allow": true
         },
         {
-            "id": 266,
-            "scopeId": 58,
-            "operationId": 272,
+            "id": 272,
+            "scopeId": 59,
+            "operationId": 278,
             "allow": true
         },
         {
-            "id": 265,
-            "scopeId": 58,
-            "operationId": 271,
+            "id": 271,
+            "scopeId": 59,
+            "operationId": 277,
             "allow": true
         },
         {
-            "id": 264,
-            "scopeId": 58,
-            "operationId": 270,
+            "id": 270,
+            "scopeId": 59,
+            "operationId": 276,
             "allow": true
         },
         {
-            "id": 263,
-            "scopeId": 58,
-            "operationId": 269,
+            "id": 269,
+            "scopeId": 59,
+            "operationId": 275,
             "allow": true
         },
         {
-            "id": 262,
-            "scopeId": 58,
-            "operationId": 268,
+            "id": 268,
+            "scopeId": 59,
+            "operationId": 274,
             "allow": true
         },
         {
-            "id": 261,
-            "scopeId": 58,
-            "operationId": 267,
+            "id": 267,
+            "scopeId": 59,
+            "operationId": 273,
             "allow": true
         },
         {
-            "id": 259,
-            "scopeId": 58,
-            "operationId": 266,
+            "id": 265,
+            "scopeId": 59,
+            "operationId": 272,
             "allow": true
         },
         {
-            "id": 257,
-            "scopeId": 58,
-            "operationId": 265,
+            "id": 263,
+            "scopeId": 59,
+            "operationId": 271,
             "allow": true
         },
         {
-            "id": 256,
-            "scopeId": 58,
-            "operationId": 264,
+            "id": 262,
+            "scopeId": 59,
+            "operationId": 270,
             "allow": true
         }
     ]
@@ -290,7 +290,7 @@ public function testPut()
 {
     "success": true,
     "message": "Scope successfully updated",
-    "id": "58"
+    "id": "59"
 }
 JSON;
 
@@ -327,7 +327,7 @@ public function testDelete()
 {
     "success": true,
     "message": "Scope successfully deleted",
-    "id": "58"
+    "id": "59"
 }
 JSON;
 
diff --git a/tests/Backend/Api/Taxonomy/EntityTest.php b/tests/Backend/Api/Taxonomy/EntityTest.php
index 33b8a389b..a4872cd75 100644
--- a/tests/Backend/Api/Taxonomy/EntityTest.php
+++ b/tests/Backend/Api/Taxonomy/EntityTest.php
@@ -82,7 +82,7 @@ public function testPost()
         $payload = [
             'operations' => [275],
             'actions' => [5],
-            'events' => [72],
+            'events' => [75],
             'cronjobs' => [2],
             'triggers' => [1],
         ];
diff --git a/tests/Backend/Api/User/CollectionTest.php b/tests/Backend/Api/User/CollectionTest.php
index 95acce79d..a699ccb2f 100644
--- a/tests/Backend/Api/User/CollectionTest.php
+++ b/tests/Backend/Api/User/CollectionTest.php
@@ -243,7 +243,7 @@ public function testPost()
 
         $userScopes = $this->connection->fetchAllAssociative($sql, ['user_id' => $data->id]);
 
-        $this->assertEquals(54, count($userScopes));
+        $this->assertEquals(55, count($userScopes));
     }
 
     public function testPostNameExists()
diff --git a/tests/Backend/Api/User/EntityTest.php b/tests/Backend/Api/User/EntityTest.php
index 99ed536f9..9e48a7e22 100644
--- a/tests/Backend/Api/User/EntityTest.php
+++ b/tests/Backend/Api/User/EntityTest.php
@@ -215,7 +215,7 @@ public function testPut()
 
         $this->assertEquals(1, count($scopes));
         $this->assertEquals(2, $scopes[0]['user_id']);
-        $this->assertEquals(58, $scopes[0]['scope_id']);
+        $this->assertEquals(59, $scopes[0]['scope_id']);
     }
 
     public function testDelete()
diff --git a/tests/Backend/Api/Webhook/CollectionTest.php b/tests/Backend/Api/Webhook/CollectionTest.php
index db433c07b..ece37c4d6 100644
--- a/tests/Backend/Api/Webhook/CollectionTest.php
+++ b/tests/Backend/Api/Webhook/CollectionTest.php
@@ -57,14 +57,14 @@ public function testGet()
     "entry": [
         {
             "id": 2,
-            "eventId": 72,
+            "eventId": {$this->eventId},
             "userId": 2,
             "name": "pong",
             "endpoint": "http:\/\/www.fusio-project.org\/ping"
         },
         {
             "id": 1,
-            "eventId": 72,
+            "eventId": {$this->eventId},
             "userId": 1,
             "name": "ping",
             "endpoint": "http:\/\/www.fusio-project.org\/ping"
@@ -113,7 +113,7 @@ public function testPost()
         $row = $this->connection->fetchAssociative($sql);
 
         $this->assertEquals(3, $row['id']);
-        $this->assertEquals(72, $row['event_id']);
+        $this->assertEquals($this->eventId, $row['event_id']);
         $this->assertEquals(1, $row['user_id']);
         $this->assertEquals('foo', $row['name']);
         $this->assertEquals('http://localhost', $row['endpoint']);
diff --git a/tests/Backend/Api/Webhook/EntityTest.php b/tests/Backend/Api/Webhook/EntityTest.php
index 85d3e6991..f7ce0fd96 100644
--- a/tests/Backend/Api/Webhook/EntityTest.php
+++ b/tests/Backend/Api/Webhook/EntityTest.php
@@ -55,7 +55,7 @@ public function testGet()
         $expect = <<<JSON
 {
     "id": 1,
-    "eventId": 72,
+    "eventId": {$this->eventId},
     "userId": 1,
     "name": "ping",
     "endpoint": "http:\/\/www.fusio-project.org\/ping",
diff --git a/tests/Consumer/Api/Authorize/AuthorizeTest.php b/tests/Consumer/Api/Authorize/AuthorizeTest.php
index 28c1d7d80..69f9cd7da 100644
--- a/tests/Consumer/Api/Authorize/AuthorizeTest.php
+++ b/tests/Consumer/Api/Authorize/AuthorizeTest.php
@@ -21,6 +21,7 @@
 namespace Fusio\Impl\Tests\Consumer\Api\Authorize;
 
 use Fusio\Impl\Tests\DbTestCase;
+use Fusio\Impl\Tests\Fixture;
 
 /**
  * AuthorizeTest
@@ -31,6 +32,17 @@
  */
 class AuthorizeTest extends DbTestCase
 {
+    private ?int $scopeFooId = null;
+    private ?int $scopeBarId = null;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->scopeFooId = Fixture::getReference('fusio_scope', 'foo')->resolve($this->connection);
+        $this->scopeBarId = Fixture::getReference('fusio_scope', 'bar')->resolve($this->connection);
+    }
+
     public function testGet()
     {
         $response = $this->sendRequest('/consumer/authorize?client_id=5347307d-d801-4075-9aaa-a21a29a448c5&scope=backend,foo,bar', 'GET', array(
@@ -40,19 +52,19 @@ public function testGet()
 
         $body = (string) $response->getBody();
 
-        $expect = <<<'JSON'
+        $expect = <<<JSON
 {
     "id": 3,
     "name": "Foo-App",
     "url": "http:\/\/google.com",
     "scopes": [
         {
-            "id": 57,
+            "id": {$this->scopeFooId},
             "name": "foo",
             "description": "Foo access"
         },
         {
-            "id": 58,
+            "id": {$this->scopeBarId},
             "name": "bar",
             "description": "Bar access"
         }
diff --git a/tests/Consumer/Api/Event/CollectionTest.php b/tests/Consumer/Api/Event/CollectionTest.php
index b01a04b0b..facd5f6d3 100644
--- a/tests/Consumer/Api/Event/CollectionTest.php
+++ b/tests/Consumer/Api/Event/CollectionTest.php
@@ -21,6 +21,7 @@
 namespace Fusio\Impl\Tests\Consumer\Api\Event;
 
 use Fusio\Impl\Tests\DbTestCase;
+use Fusio\Impl\Tests\Fixture;
 
 /**
  * CollectionTest
@@ -31,6 +32,17 @@
  */
 class CollectionTest extends DbTestCase
 {
+    private ?int $eventFooId = null;
+    private ?int $eventSecondId = null;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->eventFooId = Fixture::getReference('fusio_event', 'foo-event')->resolve($this->connection);
+        $this->eventSecondId = Fixture::getReference('fusio_event', 'second-event')->resolve($this->connection);
+    }
+
     public function testGet()
     {
         $response = $this->sendRequest('/consumer/event', 'GET', array(
@@ -40,14 +52,14 @@ public function testGet()
 
         $body = (string) $response->getBody();
 
-        $expect = <<<'JSON'
+        $expect = <<<JSON
 {
     "totalResults": 2,
     "startIndex": 0,
     "itemsPerPage": 16,
     "entry": [
         {
-            "id": 72,
+            "id": {$this->eventFooId},
             "status": 1,
             "name": "foo-event",
             "description": "Foo event description",
@@ -56,7 +68,7 @@ public function testGet()
             }
         },
         {
-            "id": 73,
+            "id": {$this->eventSecondId},
             "status": 1,
             "name": "second-event",
             "description": "Foo event description",
@@ -81,14 +93,14 @@ public function testGetSearch()
 
         $body = (string) $response->getBody();
 
-        $expect = <<<'JSON'
+        $expect = <<<JSON
 {
     "totalResults": 1,
     "startIndex": 0,
     "itemsPerPage": 16,
     "entry": [
         {
-            "id": 72,
+            "id": {$this->eventFooId},
             "status": 1,
             "name": "foo-event",
             "description": "Foo event description",
diff --git a/tests/Consumer/Api/Event/EntityTest.php b/tests/Consumer/Api/Event/EntityTest.php
index d71e75ca1..398e3994c 100644
--- a/tests/Consumer/Api/Event/EntityTest.php
+++ b/tests/Consumer/Api/Event/EntityTest.php
@@ -21,6 +21,7 @@
 namespace Fusio\Impl\Tests\Consumer\Api\Event;
 
 use Fusio\Impl\Tests\DbTestCase;
+use Fusio\Impl\Tests\Fixture;
 
 /**
  * EntityTest
@@ -31,18 +32,27 @@
  */
 class EntityTest extends DbTestCase
 {
+    private ?int $eventId = null;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->eventId = Fixture::getReference('fusio_event', 'foo-event')->resolve($this->connection);
+    }
+
     public function testGet()
     {
-        $response = $this->sendRequest('/consumer/event/72', 'GET', array(
+        $response = $this->sendRequest('/consumer/event/' . $this->eventId, 'GET', array(
             'User-Agent'    => 'Fusio TestCase',
             'Authorization' => 'Bearer b8f6f61bd22b440a3e4be2b7491066682bfcde611dbefa1b15d2e7f6522d77e2'
         ));
 
         $body = (string) $response->getBody();
 
-        $expect = <<<'JSON'
+        $expect = <<<JSON
 {
-    "id": 72,
+    "id": {$this->eventId},
     "status": 1,
     "name": "foo-event",
     "description": "Foo event description",
@@ -65,9 +75,9 @@ public function testGetByName()
 
         $body = (string) $response->getBody();
 
-        $expect = <<<'JSON'
+        $expect = <<<JSON
 {
-    "id": 72,
+    "id": {$this->eventId},
     "status": 1,
     "name": "foo-event",
     "description": "Foo event description",
@@ -95,7 +105,7 @@ public function testGetNotFound()
 
     public function testPost()
     {
-        $response = $this->sendRequest('/consumer/event/56', 'POST', array(
+        $response = $this->sendRequest('/consumer/event/' . $this->eventId, 'POST', array(
             'User-Agent'    => 'Fusio TestCase',
             'Authorization' => 'Bearer b8f6f61bd22b440a3e4be2b7491066682bfcde611dbefa1b15d2e7f6522d77e2'
         ), json_encode([
@@ -109,7 +119,7 @@ public function testPost()
 
     public function testPut()
     {
-        $response = $this->sendRequest('/consumer/event/56', 'PUT', array(
+        $response = $this->sendRequest('/consumer/event/' . $this->eventId, 'PUT', array(
             'User-Agent'    => 'Fusio TestCase',
             'Authorization' => 'Bearer b8f6f61bd22b440a3e4be2b7491066682bfcde611dbefa1b15d2e7f6522d77e2'
         ), json_encode([
@@ -126,7 +136,7 @@ public function testPut()
 
     public function testDelete()
     {
-        $response = $this->sendRequest('/consumer/event/56', 'DELETE', array(
+        $response = $this->sendRequest('/consumer/event/' . $this->eventId, 'DELETE', array(
             'User-Agent'    => 'Fusio TestCase',
             'Authorization' => 'Bearer b8f6f61bd22b440a3e4be2b7491066682bfcde611dbefa1b15d2e7f6522d77e2'
         ));
diff --git a/tests/Consumer/Api/Scope/CategoriesTest.php b/tests/Consumer/Api/Scope/CategoriesTest.php
index c286e3e8d..a41e215bb 100644
--- a/tests/Consumer/Api/Scope/CategoriesTest.php
+++ b/tests/Consumer/Api/Scope/CategoriesTest.php
@@ -21,6 +21,7 @@
 namespace Fusio\Impl\Tests\Consumer\Api\Scope;
 
 use Fusio\Impl\Tests\DbTestCase;
+use Fusio\Impl\Tests\Fixture;
 
 /**
  * CategoriesTest
@@ -31,6 +32,17 @@
  */
 class CategoriesTest extends DbTestCase
 {
+    private ?int $scopeFooId = null;
+    private ?int $scopeBarId = null;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->scopeFooId = Fixture::getReference('fusio_scope', 'foo')->resolve($this->connection);
+        $this->scopeBarId = Fixture::getReference('fusio_scope', 'bar')->resolve($this->connection);
+    }
+
     public function testGet()
     {
         $response = $this->sendRequest('/consumer/scope/categories', 'GET', array(
@@ -39,7 +51,7 @@ public function testGet()
         ));
 
         $body   = (string) $response->getBody();
-        $expect = <<<'JSON'
+        $expect = <<<JSON
 {
     "categories": [
         {
@@ -74,12 +86,12 @@ public function testGet()
             "name": "default",
             "scopes": [
                 {
-                    "id": 58,
+                    "id": {$this->scopeBarId},
                     "name": "bar",
                     "description": "Bar access"
                 },
                 {
-                    "id": 57,
+                    "id": {$this->scopeFooId},
                     "name": "foo",
                     "description": "Foo access"
                 }
diff --git a/tests/Consumer/Api/Scope/CollectionTest.php b/tests/Consumer/Api/Scope/CollectionTest.php
index 95d91763e..47da7a40d 100644
--- a/tests/Consumer/Api/Scope/CollectionTest.php
+++ b/tests/Consumer/Api/Scope/CollectionTest.php
@@ -21,6 +21,7 @@
 namespace Fusio\Impl\Tests\Consumer\Api\Scope;
 
 use Fusio\Impl\Tests\DbTestCase;
+use Fusio\Impl\Tests\Fixture;
 
 /**
  * CollectionTest
@@ -31,6 +32,17 @@
  */
 class CollectionTest extends DbTestCase
 {
+    private ?int $scopeFooId = null;
+    private ?int $scopeBarId = null;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->scopeFooId = Fixture::getReference('fusio_scope', 'foo')->resolve($this->connection);
+        $this->scopeBarId = Fixture::getReference('fusio_scope', 'bar')->resolve($this->connection);
+    }
+
     public function testGet()
     {
         $response = $this->sendRequest('/consumer/scope', 'GET', array(
@@ -40,19 +52,19 @@ public function testGet()
 
         $body = (string) $response->getBody();
 
-        $expect = <<<'JSON'
+        $expect = <<<JSON
 {
     "totalResults": 2,
     "startIndex": 0,
     "itemsPerPage": 16,
     "entry": [
         {
-            "id": 58,
+            "id": {$this->scopeBarId},
             "name": "bar",
             "description": "Bar access"
         },
         {
-            "id": 57,
+            "id": {$this->scopeFooId},
             "name": "foo",
             "description": "Foo access",
             "metadata": {
diff --git a/tests/Consumer/Api/Webhook/CollectionTest.php b/tests/Consumer/Api/Webhook/CollectionTest.php
index d61b0b9f8..7b88cba94 100644
--- a/tests/Consumer/Api/Webhook/CollectionTest.php
+++ b/tests/Consumer/Api/Webhook/CollectionTest.php
@@ -21,6 +21,7 @@
 namespace Fusio\Impl\Tests\Consumer\Api\Webhook;
 
 use Fusio\Impl\Tests\DbTestCase;
+use Fusio\Impl\Tests\Fixture;
 
 /**
  * CollectionTest
@@ -31,6 +32,15 @@
  */
 class CollectionTest extends DbTestCase
 {
+    private ?int $eventFooId = null;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->eventFooId = Fixture::getReference('fusio_event', 'foo-event')->resolve($this->connection);
+    }
+
     public function testGet()
     {
         $response = $this->sendRequest('/consumer/webhook', 'GET', array(
@@ -121,7 +131,7 @@ public function testPost()
         $row = $this->connection->fetchAssociative($sql, ['id' => $data->id]);
 
         $this->assertEquals($data->id, $row['id']);
-        $this->assertEquals(72, $row['event_id']);
+        $this->assertEquals($this->eventFooId, $row['event_id']);
         $this->assertEquals(2, $row['user_id']);
         $this->assertEquals(1, $row['status']);
         $this->assertEquals('test', $row['name']);
diff --git a/tests/Consumer/Api/Webhook/EntityTest.php b/tests/Consumer/Api/Webhook/EntityTest.php
index a58290c80..668ddc3d9 100644
--- a/tests/Consumer/Api/Webhook/EntityTest.php
+++ b/tests/Consumer/Api/Webhook/EntityTest.php
@@ -21,6 +21,7 @@
 namespace Fusio\Impl\Tests\Consumer\Api\Webhook;
 
 use Fusio\Impl\Tests\DbTestCase;
+use Fusio\Impl\Tests\Fixture;
 use Fusio\Impl\Tests\Normalizer;
 
 /**
@@ -32,6 +33,15 @@
  */
 class EntityTest extends DbTestCase
 {
+    private ?int $eventFooId = null;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->eventFooId = Fixture::getReference('fusio_event', 'foo-event')->resolve($this->connection);
+    }
+
     public function testGet()
     {
         $response = $this->sendRequest('/consumer/webhook/2', 'GET', array(
@@ -112,7 +122,7 @@ public function testPut()
         $row = $this->connection->fetchAssociative($sql, ['id' => 2]);
 
         $this->assertEquals(2, $row['id']);
-        $this->assertEquals(72, $row['event_id']);
+        $this->assertEquals($this->eventFooId, $row['event_id']);
         $this->assertEquals(2, $row['user_id']);
         $this->assertEquals(1, $row['status']);
         $this->assertEquals('foofoo', $row['name']);
diff --git a/tests/Controller/Filter/LoggerTest.php b/tests/Controller/Filter/LoggerTest.php
index 68b9705fa..db3dfe5b2 100644
--- a/tests/Controller/Filter/LoggerTest.php
+++ b/tests/Controller/Filter/LoggerTest.php
@@ -71,7 +71,7 @@ public function testHandle()
         $log = $this->connection->fetchAssociative('SELECT * FROM fusio_log WHERE id = :id', ['id' => 3]);
 
         $this->assertEquals(3, $log['id']);
-        $this->assertEquals(264, $log['operation_id']);
+        $this->assertEquals(270, $log['operation_id']);
         $this->assertEquals(1, $log['app_id']);
         $this->assertEquals(1, $log['user_id']);
         $this->assertEquals('127.0.0.1', $log['ip']);
@@ -105,7 +105,7 @@ public function testHandleLongUserAgent()
         $log = $this->connection->fetchAssociative('SELECT * FROM fusio_log WHERE id = :id', ['id' => 3]);
 
         $this->assertEquals(3, $log['id']);
-        $this->assertEquals(264, $log['operation_id']);
+        $this->assertEquals(270, $log['operation_id']);
         $this->assertEquals(1, $log['app_id']);
         $this->assertEquals(1, $log['user_id']);
         $this->assertEquals('127.0.0.1', $log['ip']);
@@ -139,7 +139,7 @@ public function testHandleLongPath()
         $log = $this->connection->fetchAssociative('SELECT * FROM fusio_log WHERE id = :id', ['id' => 3]);
 
         $this->assertEquals(3, $log['id']);
-        $this->assertEquals(264, $log['operation_id']);
+        $this->assertEquals(270, $log['operation_id']);
         $this->assertEquals(1, $log['app_id']);
         $this->assertEquals(1, $log['user_id']);
         $this->assertEquals('127.0.0.1', $log['ip']);
@@ -174,7 +174,7 @@ public function testHandlePost()
         $log = $this->connection->fetchAssociative('SELECT * FROM fusio_log WHERE id = :id', ['id' => 3]);
 
         $this->assertEquals(3, $log['id']);
-        $this->assertEquals(264, $log['operation_id']);
+        $this->assertEquals(270, $log['operation_id']);
         $this->assertEquals(1, $log['app_id']);
         $this->assertEquals(1, $log['user_id']);
         $this->assertEquals('127.0.0.1', $log['ip']);
diff --git a/tests/Controller/SqlTableTest.php b/tests/Controller/SqlTableTest.php
index 85e641133..9fa0ea53f 100644
--- a/tests/Controller/SqlTableTest.php
+++ b/tests/Controller/SqlTableTest.php
@@ -107,7 +107,7 @@ public function testGetChangeStatus()
 {
     "success": true,
     "message": "Operation successfully updated",
-    "id": "264"
+    "id": "270"
 }
 JSON;
 
diff --git a/tests/Fixture.php b/tests/Fixture.php
index 5cbb42bf0..5d929c2ef 100644
--- a/tests/Fixture.php
+++ b/tests/Fixture.php
@@ -40,6 +40,7 @@
 use Fusio\Impl\Provider\Identity\OpenIDConnect;
 use Fusio\Impl\Service;
 use Fusio\Impl\Table;
+use Fusio\Impl\Tests\Adapter\Test\AgentConnection;
 use Fusio\Impl\Tests\Adapter\Test\InspectAction;
 use Fusio\Impl\Tests\Adapter\Test\MimeAction;
 use Fusio\Impl\Tests\Adapter\Test\PaypalConnection;
@@ -132,6 +133,7 @@ private static function appendTestInserts(DataBag $data): void
         $data->addConnection('LocalFilesystem', Filesystem::class, Service\Connection\Encrypter::encrypt(['config' => './tests/resources'], $secretKey));
         $data->addConnection('FusioHttpClient', Http::class, Service\Connection\Encrypter::encrypt(['url' => 'https://api.fusio-project.org/'], $secretKey));
         $data->addConnection('StarwarsSDK', Starwars::class, Service\Connection\Encrypter::encrypt([], $secretKey));
+        $data->addConnection('Agent', AgentConnection::class, Service\Connection\Encrypter::encrypt([], $secretKey));
         $data->addCronjob('default', 'Test-Cron', '* * * * *', 'Sql-Select-All', ['foo' => 'bar']);
         $data->addCronjob('default', 'Second-Cron', '* * * * *', 'Sql-Select-All', ['foo' => 'bar'], taxonomy: 'feature_a');
         $data->addCronjobError('Test-Cron', 'Syntax error, malformed JSON');
@@ -140,6 +142,9 @@ private static function appendTestInserts(DataBag $data): void
         $data->addFirewall('my_v4_rule', '192.168.2.1', ['foo' => 'bar']);
         $data->addFirewall('my_v6_rule', '2001:0db8:85a3:08d3:1319:8a2e:0370:7344', ['foo' => 'bar']);
         $data->addForm('my_form', 'test.createFoo', ['foo' => 'bar'], ['foo' => 'bar']);
+        $data->addAgent('default', 'Agent', Table\Agent::TYPE_GENERAL, 'agent-test', 'An agent test', 'A test agent which always return "Hello World"', ['test_listFoo'], 'schema://Entry-Schema', 'action://Inspect-Action', date: '2026-02-22 13:06:00');
+        $data->addAgentMessage('agent-test', 'Administrator', Table\Agent\Message::ORIGIN_USER, 'This is a test message', date: '2026-02-22 19:17:00');
+        $data->addAgentMessage('agent-test', 'Administrator', Table\Agent\Message::ORIGIN_ASSISTANT, 'And an agent response', 1, date: '2026-02-22 19:17:00');
         $data->addWebhook('foo-event', 'Administrator', 'ping', 'http://www.fusio-project.org/ping');
         $data->addWebhook('foo-event', 'Consumer', 'pong', 'http://www.fusio-project.org/ping');
         $data->addWebhookResponse(1);
diff --git a/tests/System/resources/typeapi_fusio.json b/tests/System/resources/typeapi_fusio.json
index 176d2e670..38b5faf10 100644
--- a/tests/System/resources/typeapi_fusio.json
+++ b/tests/System/resources/typeapi_fusio.json
@@ -8,6 +8,7 @@
       "backend",
       "backend.account",
       "backend.action",
+      "backend.agent",
       "backend.app",
       "backend.audit",
       "backend.backup",
@@ -583,6 +584,328 @@
         "action"
       ]
     },
+    "backend.agent.create": {
+      "path": "/backend/agent",
+      "method": "POST",
+      "return": {
+        "code": 201,
+        "schema": {
+          "type": "reference",
+          "target": "Common_Message"
+        }
+      },
+      "arguments": {
+        "payload": {
+          "in": "body",
+          "schema": {
+            "type": "reference",
+            "target": "Backend_AgentCreate"
+          }
+        }
+      },
+      "throws": [
+        {
+          "code": 999,
+          "schema": {
+            "type": "reference",
+            "target": "Common_Message"
+          }
+        }
+      ],
+      "description": "Creates a new agent",
+      "stability": 2,
+      "security": [
+        "backend.agent"
+      ],
+      "authorization": true,
+      "tags": [
+        "agent"
+      ]
+    },
+    "backend.agent.delete": {
+      "path": "/backend/agent/$agent_id<[0-9]+|^~>",
+      "method": "DELETE",
+      "return": {
+        "code": 200,
+        "schema": {
+          "type": "reference",
+          "target": "Common_Message"
+        }
+      },
+      "arguments": {
+        "agent_id": {
+          "in": "path",
+          "schema": {
+            "type": "string"
+          }
+        }
+      },
+      "throws": [
+        {
+          "code": 999,
+          "schema": {
+            "type": "reference",
+            "target": "Common_Message"
+          }
+        }
+      ],
+      "description": "Deletes an existing agent",
+      "stability": 2,
+      "security": [
+        "backend.agent"
+      ],
+      "authorization": true,
+      "tags": [
+        "agent"
+      ]
+    },
+    "backend.agent.get": {
+      "path": "/backend/agent/$agent_id<[0-9]+|^~>",
+      "method": "GET",
+      "return": {
+        "code": 200,
+        "schema": {
+          "type": "reference",
+          "target": "Backend_Agent"
+        }
+      },
+      "arguments": {
+        "agent_id": {
+          "in": "path",
+          "schema": {
+            "type": "string"
+          }
+        }
+      },
+      "throws": [
+        {
+          "code": 999,
+          "schema": {
+            "type": "reference",
+            "target": "Common_Message"
+          }
+        }
+      ],
+      "description": "Returns a specific agent",
+      "stability": 2,
+      "security": [
+        "backend.agent"
+      ],
+      "authorization": true,
+      "tags": [
+        "agent"
+      ]
+    },
+    "backend.agent.getAll": {
+      "path": "/backend/agent",
+      "method": "GET",
+      "return": {
+        "code": 200,
+        "schema": {
+          "type": "reference",
+          "target": "Backend_AgentCollection"
+        }
+      },
+      "arguments": {
+        "startIndex": {
+          "in": "query",
+          "schema": {
+            "type": "integer"
+          }
+        },
+        "count": {
+          "in": "query",
+          "schema": {
+            "type": "integer"
+          }
+        },
+        "search": {
+          "in": "query",
+          "schema": {
+            "type": "string"
+          }
+        }
+      },
+      "throws": [
+        {
+          "code": 999,
+          "schema": {
+            "type": "reference",
+            "target": "Common_Message"
+          }
+        }
+      ],
+      "description": "Returns a paginated list of agents",
+      "stability": 2,
+      "security": [
+        "backend.agent"
+      ],
+      "authorization": true,
+      "tags": [
+        "agent"
+      ]
+    },
+    "backend.agent.getTools": {
+      "path": "/backend/agent/tools",
+      "method": "GET",
+      "return": {
+        "code": 200,
+        "schema": {
+          "type": "reference",
+          "target": "Backend_AgentTools"
+        }
+      },
+      "arguments": [],
+      "throws": [
+        {
+          "code": 999,
+          "schema": {
+            "type": "reference",
+            "target": "Common_Message"
+          }
+        }
+      ],
+      "description": "Returns available tools for an agent",
+      "stability": 2,
+      "security": [
+        "backend.agent"
+      ],
+      "authorization": true,
+      "tags": [
+        "agent"
+      ]
+    },
+    "backend.agent.message.getAll": {
+      "path": "/backend/agent/$agent_id<[0-9]+|^~>/message",
+      "method": "GET",
+      "return": {
+        "code": 200,
+        "schema": {
+          "type": "reference",
+          "target": "Backend_AgentMessageCollection"
+        }
+      },
+      "arguments": {
+        "agent_id": {
+          "in": "path",
+          "schema": {
+            "type": "string"
+          }
+        },
+        "parent": {
+          "in": "query",
+          "schema": {
+            "type": "integer"
+          }
+        }
+      },
+      "throws": [
+        {
+          "code": 999,
+          "schema": {
+            "type": "reference",
+            "target": "Common_Message"
+          }
+        }
+      ],
+      "description": "Returns a paginated list of agent messages",
+      "stability": 2,
+      "security": [
+        "backend.agent"
+      ],
+      "authorization": true,
+      "tags": [
+        "agent"
+      ]
+    },
+    "backend.agent.message.submit": {
+      "path": "/backend/agent/$agent_id<[0-9]+|^~>/message",
+      "method": "POST",
+      "return": {
+        "code": 201,
+        "schema": {
+          "type": "reference",
+          "target": "Backend_AgentMessage"
+        }
+      },
+      "arguments": {
+        "agent_id": {
+          "in": "path",
+          "schema": {
+            "type": "string"
+          }
+        },
+        "payload": {
+          "in": "body",
+          "schema": {
+            "type": "reference",
+            "target": "Backend_AgentContent"
+          }
+        }
+      },
+      "throws": [
+        {
+          "code": 999,
+          "schema": {
+            "type": "reference",
+            "target": "Common_Message"
+          }
+        }
+      ],
+      "description": "Submits a new agent message",
+      "stability": 2,
+      "security": [
+        "backend.agent"
+      ],
+      "authorization": true,
+      "tags": [
+        "agent"
+      ]
+    },
+    "backend.agent.update": {
+      "path": "/backend/agent/$agent_id<[0-9]+|^~>",
+      "method": "PUT",
+      "return": {
+        "code": 200,
+        "schema": {
+          "type": "reference",
+          "target": "Common_Message"
+        }
+      },
+      "arguments": {
+        "agent_id": {
+          "in": "path",
+          "schema": {
+            "type": "string"
+          }
+        },
+        "payload": {
+          "in": "body",
+          "schema": {
+            "type": "reference",
+            "target": "Backend_AgentUpdate"
+          }
+        }
+      },
+      "throws": [
+        {
+          "code": 999,
+          "schema": {
+            "type": "reference",
+            "target": "Common_Message"
+          }
+        }
+      ],
+      "description": "Updates an existing agent",
+      "stability": 2,
+      "security": [
+        "backend.agent"
+      ],
+      "authorization": true,
+      "tags": [
+        "agent"
+      ]
+    },
     "backend.app.create": {
       "path": "/backend/app",
       "method": "POST",
@@ -1606,86 +1929,6 @@
         "config"
       ]
     },
-    "backend.connection.agent.get": {
-      "path": "/backend/connection/:connection_id/agent",
-      "method": "GET",
-      "return": {
-        "code": 200,
-        "schema": {
-          "type": "reference",
-          "target": "Backend_AgentCollection"
-        }
-      },
-      "arguments": {
-        "connection_id": {
-          "in": "path",
-          "schema": {
-            "type": "string"
-          }
-        },
-        "intent": {
-          "in": "query",
-          "schema": {
-            "type": "string"
-          }
-        }
-      },
-      "throws": [
-        {
-          "code": 999,
-          "schema": {
-            "type": "reference",
-            "target": "Common_Message"
-          }
-        }
-      ],
-      "description": "Returns all previous sent messages",
-      "stability": 2,
-      "security": [
-        "backend.connection"
-      ],
-      "authorization": true,
-      "tags": [
-        "connection"
-      ]
-    },
-    "backend.connection.agent.reset": {
-      "path": "/backend/connection/:connection_id/agent",
-      "method": "DELETE",
-      "return": {
-        "code": 200,
-        "schema": {
-          "type": "reference",
-          "target": "Common_Message"
-        }
-      },
-      "arguments": {
-        "connection_id": {
-          "in": "path",
-          "schema": {
-            "type": "string"
-          }
-        }
-      },
-      "throws": [
-        {
-          "code": 999,
-          "schema": {
-            "type": "reference",
-            "target": "Common_Message"
-          }
-        }
-      ],
-      "description": "Resets all agent messages",
-      "stability": 2,
-      "security": [
-        "backend.connection"
-      ],
-      "authorization": true,
-      "tags": [
-        "connection"
-      ]
-    },
     "backend.connection.agent.send": {
       "path": "/backend/connection/:connection_id/agent",
       "method": "POST",
@@ -1693,7 +1936,7 @@
         "code": 200,
         "schema": {
           "type": "reference",
-          "target": "Backend_AgentResponse"
+          "target": "Backend_AgentContent"
         }
       },
       "arguments": {
@@ -1707,7 +1950,7 @@
           "in": "body",
           "schema": {
             "type": "reference",
-            "target": "Backend_AgentRequest"
+            "target": "Backend_AgentContent"
           }
         }
       },
@@ -12376,25 +12619,56 @@
       }
     },
     "Backend_Agent": {
-      "description": "This object represents an agent message",
+      "description": "This object represents an agent",
       "type": "struct",
       "properties": {
         "id": {
           "description": "Unique identifier for the object",
           "type": "integer"
         },
-        "origin": {
-          "description": "The origin of this message i.e. 1 = user, 2 = assistant or 3 = system",
+        "connection": {
+          "description": "The agent connection which should be used",
           "type": "integer"
         },
-        "message": {
-          "description": "The message",
-          "type": "reference",
-          "target": "Backend_AgentMessage"
+        "type": {
+          "description": "The agent type",
+          "type": "integer"
+        },
+        "name": {
+          "description": "Name of the agent",
+          "type": "string"
+        },
+        "description": {
+          "description": "Description of the agent",
+          "type": "string"
+        },
+        "introduction": {
+          "description": "Introduction message",
+          "type": "string"
+        },
+        "tools": {
+          "description": "Tools available to this agent",
+          "type": "array",
+          "schema": {
+            "type": "string"
+          }
+        },
+        "outgoing": {
+          "description": "Describes the outgoing response payload, this must contain a schema name",
+          "type": "string"
+        },
+        "action": {
+          "description": "Action which gets invoked for each generated response",
+          "type": "string"
         },
         "insertDate": {
           "type": "string",
           "format": "date-time"
+        },
+        "metadata": {
+          "description": "Use this parameter to attach key-value data",
+          "type": "reference",
+          "target": "Common_Metadata"
         }
       }
     },
@@ -12409,8 +12683,8 @@
         }
       }
     },
-    "Backend_AgentMessage": {
-      "description": "Agent call result",
+    "Backend_AgentContent": {
+      "description": "Agent message",
       "type": "struct",
       "base": true,
       "properties": {
@@ -12428,19 +12702,19 @@
       },
       "discriminator": "type",
       "mapping": {
-        "Backend_AgentMessageBinary": "binary",
-        "Backend_AgentMessageChoice": "choice",
-        "Backend_AgentMessageObject": "object",
-        "Backend_AgentMessageText": "text",
-        "Backend_AgentMessageToolCall": "tool_call"
+        "Backend_AgentContentBinary": "binary",
+        "Backend_AgentContentChoice": "choice",
+        "Backend_AgentContentObject": "object",
+        "Backend_AgentContentText": "text",
+        "Backend_AgentContentToolCall": "tool_call"
       }
     },
-    "Backend_AgentMessageBinary": {
-      "description": "Binary agent result",
+    "Backend_AgentContentBinary": {
+      "description": "Binary agent message",
       "type": "struct",
       "parent": {
         "type": "reference",
-        "target": "Backend_AgentMessage"
+        "target": "Backend_AgentContent"
       },
       "properties": {
         "mime": {
@@ -12453,30 +12727,30 @@
         }
       }
     },
-    "Backend_AgentMessageChoice": {
-      "description": "Choice agent result",
+    "Backend_AgentContentChoice": {
+      "description": "Choice agent message",
       "type": "struct",
       "parent": {
         "type": "reference",
-        "target": "Backend_AgentMessage"
+        "target": "Backend_AgentContent"
       },
       "properties": {
         "items": {
-          "description": "Contains multiple agent results",
+          "description": "Contains multiple agent messages",
           "type": "array",
           "schema": {
             "type": "reference",
-            "target": "Backend_AgentMessage"
+            "target": "Backend_AgentContent"
           }
         }
       }
     },
-    "Backend_AgentMessageObject": {
-      "description": "Structured agent result",
+    "Backend_AgentContentObject": {
+      "description": "Structured agent message",
       "type": "struct",
       "parent": {
         "type": "reference",
-        "target": "Backend_AgentMessage"
+        "target": "Backend_AgentContent"
       },
       "properties": {
         "payload": {
@@ -12485,12 +12759,12 @@
         }
       }
     },
-    "Backend_AgentMessageText": {
-      "description": "Text agent result",
+    "Backend_AgentContentText": {
+      "description": "Text agent message",
       "type": "struct",
       "parent": {
         "type": "reference",
-        "target": "Backend_AgentMessage"
+        "target": "Backend_AgentContent"
       },
       "properties": {
         "content": {
@@ -12499,12 +12773,12 @@
         }
       }
     },
-    "Backend_AgentMessageToolCall": {
-      "description": "Tool call agent result",
+    "Backend_AgentContentToolCall": {
+      "description": "Tool call agent message",
       "type": "struct",
       "parent": {
         "type": "reference",
-        "target": "Backend_AgentMessage"
+        "target": "Backend_AgentContent"
       },
       "properties": {
         "functions": {
@@ -12512,12 +12786,12 @@
           "type": "array",
           "schema": {
             "type": "reference",
-            "target": "Backend_AgentMessageToolCallFunction"
+            "target": "Backend_AgentContentToolCallFunction"
           }
         }
       }
     },
-    "Backend_AgentMessageToolCallFunction": {
+    "Backend_AgentContentToolCallFunction": {
       "description": "Concrete values for a function tool call",
       "type": "struct",
       "properties": {
@@ -12532,32 +12806,81 @@
         }
       }
     },
-    "Backend_AgentRequest": {
-      "description": "This object represents an agent request",
+    "Backend_AgentCreate": {
+      "type": "struct",
+      "parent": {
+        "type": "reference",
+        "target": "Backend_Agent"
+      }
+    },
+    "Backend_AgentMessage": {
+      "description": "This object represents an agent message",
       "type": "struct",
       "properties": {
-        "intent": {
-          "description": "The intent of this request i.e. to develop an action or a general request",
+        "id": {
+          "description": "Unique identifier for the object",
+          "type": "integer"
+        },
+        "role": {
+          "description": "The role of this message i.e. user, assistant or system",
           "type": "string"
         },
-        "input": {
-          "description": "The input message",
+        "content": {
+          "description": "The message content",
           "type": "reference",
-          "target": "Backend_AgentMessage"
+          "target": "Backend_AgentContent"
+        },
+        "insertDate": {
+          "type": "string",
+          "format": "date-time"
         }
       }
     },
-    "Backend_AgentResponse": {
-      "description": "This object represents an agent response",
+    "Backend_AgentMessageCollection": {
+      "description": "Represents a collection of agent messages",
+      "type": "struct",
+      "parent": {
+        "type": "reference",
+        "target": "Common_Collection",
+        "template": {
+          "T": "Backend_AgentMessage"
+        }
+      }
+    },
+    "Backend_AgentTool": {
+      "description": "Represents a concrete tool",
       "type": "struct",
       "properties": {
-        "output": {
-          "description": "The output message",
-          "type": "reference",
-          "target": "Backend_AgentMessage"
+        "name": {
+          "description": "Name of the tool",
+          "type": "string"
+        },
+        "description": {
+          "description": "Description of the tool",
+          "type": "string"
+        }
+      }
+    },
+    "Backend_AgentTools": {
+      "description": "Represents a collection of available tools",
+      "type": "struct",
+      "properties": {
+        "tools": {
+          "type": "array",
+          "schema": {
+            "type": "reference",
+            "target": "Backend_AgentTool"
+          }
         }
       }
     },
+    "Backend_AgentUpdate": {
+      "type": "struct",
+      "parent": {
+        "type": "reference",
+        "target": "Backend_Agent"
+      }
+    },
     "Backend_App": {
       "description": "This object represents an app to access the API on-behalf of a user",
       "type": "struct",