diff --git a/.gitattributes b/.gitattributes
index a739380..91e3d90 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -7,3 +7,5 @@
 *.md text eol=lf
 *.gitattributes text eol=lf
 *.gitignore text eol=lf
+*.php text eol=lf
+*.env text eol=lf
diff --git a/.github/workflows/build-app-image.yml b/.github/workflows/build-app-image.yml
index fefcea1..d77f6a1 100644
--- a/.github/workflows/build-app-image.yml
+++ b/.github/workflows/build-app-image.yml
@@ -11,10 +11,17 @@ on:
     inputs:
       push:
         description: 'Push Image (true or false)'
+        type: choice
+        options:
+          - "true"
+          - "false"
         required: true
-        default: 'true'
       run_tests:
         description: 'Run unit tests (true or false)'
+        type: choice
+        options:
+          - "true"
+          - "false"
         required: true
         default: 'true'
 
diff --git a/.gitignore b/.gitignore
index 0eb43ad..eb5195e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,9 @@ node_modules
 .mysql
 .phpunit.result.cache
 TODO
+
+thunder-tests
+
+.secrets
+.env
+ignore.txt
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 9fa5cd7..78117c6 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -59,6 +59,25 @@
                 "XDEBUG_MODE": "debug,develop",
                 "XDEBUG_CONFIG": "client_port=${port}"
             }
+        },
+        {
+            "name": "PHPUnit Debug (Current file)",
+            "type": "php",
+            "request": "launch",
+            "program": "${workspaceFolder}/vendor/bin/phpunit",
+            "args": [
+                "${file}"
+            ],
+            "cwd": "${workspaceFolder}",
+            "port": 9003,
+            "runtimeArgs": [
+                "-dxdebug.start_with_request=yes"
+            ],
+            "env": {
+                "APP_ENV": "test",
+                "XDEBUG_MODE": "debug,develop",
+                "XDEBUG_CONFIG": "client_port=${port}"
+            }
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/composer.json b/composer.json
index b6a7f17..a047447 100644
--- a/composer.json
+++ b/composer.json
@@ -8,10 +8,11 @@
     "php": ">=8.1",
     "ext-json": "*",
     "ext-openssl": "*",
+    "ext-curl": "*",
     "byjg/config": "4.9.x-dev",
     "byjg/anydataset-db": "4.9.x-dev",
-    "byjg/micro-orm": "4.9.*",
-    "byjg/authuser": "4.9.*",
+    "byjg/micro-orm": "4.9.x-dev",
+    "byjg/authuser": "4.9.x-dev",
     "byjg/mailwrapper": "4.9.*",
     "byjg/restserver": "4.9.x-dev",
     "zircote/swagger-php": "^4.6.1",
@@ -35,6 +36,7 @@
     "migrate": "Builder\\Scripts::migrate",
     "codegen": "Builder\\Scripts::codeGenerator",
     "openapi": "Builder\\Scripts::genOpenApiDocs",
+    "compile": "composer run openapi && composer run test",
     "up-local-dev": "docker compose -f docker-compose-dev.yml up -d",
     "down-local-dev": "docker compose -f docker-compose-dev.yml down",
     "post-create-project-cmd": "Builder\\PostCreateScript::run"
diff --git a/config/config-dev.php b/config/config-dev.php
index a93587a..cb8fb48 100644
--- a/config/config-dev.php
+++ b/config/config-dev.php
@@ -17,7 +17,6 @@
 use ByJG\Mail\Wrapper\FakeSenderWrapper;
 use ByJG\Mail\Wrapper\MailgunApiWrapper;
 use ByJG\Mail\Wrapper\MailWrapperInterface;
-use ByJG\MicroOrm\Literal;
 use ByJG\RestServer\HttpRequestHandler;
 use ByJG\RestServer\Middleware\CorsMiddleware;
 use ByJG\RestServer\OutputProcessor\JsonCleanOutputProcessor;
@@ -28,7 +27,7 @@
 use RestTemplate\Psr11;
 use RestTemplate\Repository\DummyHexRepository;
 use RestTemplate\Repository\DummyRepository;
-use RestTemplate\Util\HexUuidLiteral;
+use RestTemplate\Repository\UserDefinition as UserDefinitionAlias;
 
 return [
 
@@ -88,7 +87,7 @@
         ]])
         ->toSingleton(),
 
-    UserDefinition::class => DI::bind(UserDefinition::class)
+    UserDefinition::class => DI::bind(UserDefinitionAlias::class)
         ->withConstructorArgs(
             [
                 'users',       // Table name
@@ -96,50 +95,16 @@
                 UserDefinition::LOGIN_IS_EMAIL,
                 [
                     // Field name in the User class => Field name in the database
-                    'userid'   => 'userid',
-                    'name'     => 'name',
-                    'email'    => 'email',
+                    'userid' => 'userid',
+                    'name' => 'name',
+                    'email' => 'email',
                     'username' => 'username',
                     'password' => 'password',
-                    'created'  => 'created',
-                    'admin'    => 'admin'
+                    'created' => 'created',
+                    'admin' => 'admin'
                 ]
             ]
         )
-        ->withMethodCall("markPropertyAsReadOnly", ["uuid"])
-        ->withMethodCall("markPropertyAsReadOnly", ["created"])
-        ->withMethodCall("markPropertyAsReadOnly", ["updated"])
-        ->withMethodCall("defineGenerateKeyClosure", 
-            [
-                function () {
-                    return new Literal("X'" . Psr11::container()->get(DbDriverInterface::class)->getScalar("SELECT hex(uuid_to_bin(uuid()))") . "'");
-                }
-            ]
-        )
-        ->withMethodCall("defineClosureForSelect", [
-            "userid",
-            function ($value, $instance) {
-                if (!method_exists($instance, 'getUuid')) {
-                    return $value;
-                }
-                if (!empty($instance->getUuid())) {
-                    return $instance->getUuid();
-                }
-                return $value;
-            }
-        ])
-        ->withMethodCall("defineClosureForUpdate", [
-            'userid',
-            function ($value, $instance) {
-                if (empty($value)) {
-                    return null;
-                }
-                if (!($value instanceof Literal)) {
-                    $value = new HexUuidLiteral($value);
-                }
-                return $value;
-            }
-        ])
         ->toSingleton(),
 
     UserPropertiesDefinition::class => DI::bind(UserPropertiesDefinition::class)
@@ -149,7 +114,7 @@ function ($value, $instance) {
         ->withInjectedConstructor()
         ->toSingleton(),
 
-        'CORS_SERVER_LIST' => function () {
+    'CORS_SERVER_LIST' => function () {
         return preg_split('/,(?![^{}]*})/', Psr11::container()->get('CORS_SERVERS'));
     },
 
diff --git a/docs/getting_started_03_create_rest_method.md b/docs/getting_started_03_create_rest_method.md
index 6c74e4c..7629c39 100644
--- a/docs/getting_started_03_create_rest_method.md
+++ b/docs/getting_started_03_create_rest_method.md
@@ -160,6 +160,8 @@ public function putExampleCrudStatus(HttpResponse $response, HttpRequest $reques
 The last step is to return the result as specified in the OpenAPI attributes.
 
 ```php
+public function putExampleCrudStatus(HttpResponse $response, HttpRequest $request) 
+{
 ... 
     $response->write([
         "result" => "ok"
diff --git a/public/app.php b/public/app.php
index 20e83ba..6764398 100644
--- a/public/app.php
+++ b/public/app.php
@@ -2,16 +2,15 @@
 
 require_once __DIR__ . '/../vendor/autoload.php';
 
-use RestTemplate\Psr11;
 use ByJG\RestServer\HttpRequestHandler;
-use ByJG\RestServer\Middleware\CorsMiddleware;
 use ByJG\RestServer\Route\OpenApiRouteList;
+use RestTemplate\Psr11;
 
 class App
 {
     public static function run()
     {
-        $server = Psr11::container()->get(HttpRequestHandler::class); 
+        $server = Psr11::container()->get(HttpRequestHandler::class);
         $server->handle(Psr11::container()->get(OpenApiRouteList::class));
     }
 }
diff --git a/public/docs/index.html b/public/docs/index.html
index 8d2148d..5b384bd 100644
--- a/public/docs/index.html
+++ b/public/docs/index.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="UTF-8">
     <title>OpenAPI Viewer</title>
-    <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/swagger-ui/3.19.5/swagger-ui.css" >
+    <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/swagger-ui/5.7.2/swagger-ui.css" >
     <link rel="icon" type="image/png" href="./favicon-32x32.png" sizes="32x32" />
     <style>
       .topbar {
@@ -14,8 +14,8 @@
 
   <body>
     <div id="swagger-ui"></div>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/swagger-ui/3.19.5/swagger-ui-bundle.js"> </script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/swagger-ui/3.19.5/swagger-ui-standalone-preset.js"> </script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/swagger-ui/5.7.2/swagger-ui-bundle.js"> </script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/swagger-ui/5.7.2/swagger-ui-standalone-preset.js"> </script>
     <script src="./require.js"> </script>
     <script src="./openapi.js"> </script>
   </body>
diff --git a/public/docs/openapi.json b/public/docs/openapi.json
index 977e0a9..a825c77 100644
--- a/public/docs/openapi.json
+++ b/public/docs/openapi.json
@@ -392,7 +392,7 @@
                 "summary": "Create a new Dummy",
                 "operationId": "POST::/dummy::RestTemplate\\Rest\\DummyRest::postDummy",
                 "requestBody": {
-                    "description": "The object DummyHex to be created",
+                    "description": "The object Dummy to be created",
                     "required": true,
                     "content": {
                         "application/json": {
@@ -929,14 +929,39 @@
                     "email"
                 ],
                 "properties": {
+                    "userid": {
+                        "type": "string",
+                        "format": "string"
+                    },
+                    "name": {
+                        "type": "string",
+                        "format": "string"
+                    },
+                    "email": {
+                        "type": "string",
+                        "format": "string"
+                    },
+                    "username": {
+                        "type": "string",
+                        "format": "string"
+                    },
+                    "password": {
+                        "type": "string",
+                        "format": "string"
+                    },
+                    "created": {
+                        "type": "string",
+                        "format": "string"
+                    },
                     "updated": {
                         "type": "string",
                         "format": "string"
                     },
-                    "uuid": {
+                    "admin": {
                         "type": "string",
                         "format": "string"
-                    }
+                    },
+                    "uuid": {}
                 },
                 "type": "object",
                 "xml": {
diff --git a/src/Model/User.php b/src/Model/User.php
index 8ba38e7..aa40604 100644
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -90,7 +90,7 @@ class User extends UserModel
     public function __construct(string $name = "", string $email = "", string $username = "", string $password = "", string $admin = "")
     {
         parent::__construct($name, $email, $username, $password, $admin);
-        
+
         $this->withPasswordDefinition(Psr11::container()->get(PasswordDefinition::class));
     }
 
diff --git a/src/Psr11.php b/src/Psr11.php
index d309824..1d6cd24 100644
--- a/src/Psr11.php
+++ b/src/Psr11.php
@@ -43,13 +43,9 @@ public static function environment(): ?Definition
         if (is_null(self::$definition)) {
             self::$definition = (new Definition())
                 ->addConfig('dev')
-                ->addConfig('test')
-                    ->inheritFrom('dev')
-                ->addConfig('staging')
-                    ->inheritFrom('dev')
-                ->addConfig('prod')
-                    ->inheritFrom('staging')
-                    ->inheritFrom('dev')
+                ->addConfig('test' , inheritFrom: ['dev'])
+                ->addConfig('staging', inheritFrom: ['dev'])
+                ->addConfig('prod', inheritFrom: ['staging', 'dev'])
                 ->setCache(['dev', 'test'], new NoCacheEngine())
                 ->setCache(['prod', 'staging'], new FileSystemCacheEngine())
             ;
diff --git a/src/Repository/BaseRepository.php b/src/Repository/BaseRepository.php
index 9cb6585..3be2498 100644
--- a/src/Repository/BaseRepository.php
+++ b/src/Repository/BaseRepository.php
@@ -32,6 +32,11 @@ public function get($itemId)
         return $this->repository->get($this->prepareUuidQuery($itemId));
     }
 
+    public function getMapper()
+    {
+        return $this->repository->getMapper();
+    }
+
     protected function prepareUuidQuery($itemId)
     {
         $result = [];
@@ -57,42 +62,35 @@ protected function prepareUuidQuery($itemId)
     /**
      * @param int|null $page
      * @param int $size
-     * @param null $orderBy
-     * @param null $filter
+     * @param string|array|null $orderBy
+     * @param string|array|null $filter
      * @return array
      * @throws \ByJG\MicroOrm\Exception\InvalidArgumentException
      * @throws InvalidArgumentException
      */
-    public function list(?int $page = 0, int $size = 20, $orderBy = null, $filter = null): array
+    public function list($page = 0, $size = 20, $orderBy = null, $filter = null)
     {
-        if (empty($page)) {
-            $page = 0;
-        }
-
-        if (empty($size)) {
-            $size = 20;
-        }
+        $query = $this->listQuery(page: $page, size: $size, orderBy: $orderBy, filter: $filter);
 
-        $query = Query::getInstance()
-            ->table($this->repository->getMapper()->getTable())
-            ->limit($page*$size, $size);
+        return $this->repository
+            ->getByQuery($query);
+    }
 
-        if (!empty($orderBy)) {
-            if (!is_array($orderBy)) {
-                $orderBy = [$orderBy];
-            }
-            $query->orderBy($orderBy);
-        }
+    /**
+     * @throws \ByJG\MicroOrm\Exception\InvalidArgumentException
+     * @throws InvalidArgumentException
+     */
+    public function listGeneric($tableName, $fields = [], $page = 0, $size = 20, $orderBy = null, $filter = null)
+    {
+        $query = $this->listQuery($tableName, $fields, $page, $size, $orderBy, $filter);
 
-        foreach ((array)$filter as $item) {
-            $query->where($item[0], $item[1]);
-        }
+        $object = $query->build($this->repository->getDbDriver());
 
-        return $this->repository
-            ->getByQuery($query);
+        $iterator = $this->repository->getDbDriver()->getIterator($object["sql"], $object["params"]);
+        return $iterator->toArray();
     }
 
-    public function listGeneric($tableName, $page = 0, $size = 20, $orderBy = null, $filter = null): array
+    public function listQuery($tableName = null, $fields = [], $page = 0, $size = 20, $orderBy = null, $filter = null): Query
     {
         if (empty($page)) {
             $page = 0;
@@ -103,8 +101,12 @@ public function listGeneric($tableName, $page = 0, $size = 20, $orderBy = null,
         }
 
         $query = Query::getInstance()
-            ->table($tableName)
-            ->limit($page*$size, $size);
+            ->table($tableName ?? $this->repository->getMapper()->getTable())
+            ->limit($page * $size, $size);
+
+        if (!empty($fields)) {
+            $query->fields($fields);
+        }
 
         if (!empty($orderBy)) {
             if (!is_array($orderBy)) {
@@ -113,14 +115,11 @@ public function listGeneric($tableName, $page = 0, $size = 20, $orderBy = null,
             $query->orderBy($orderBy);
         }
 
-        foreach ((array)$filter as $item) {
+        foreach ((array) $filter as $item) {
             $query->where($item[0], $item[1]);
         }
 
-        $object = $query->build($this->repository->getDbDriver());
-
-        $iterator = $this->repository->getDbDriver()->getIterator($object["sql"], $object["params"]);
-        return $iterator->toArray();
+        return $query;
     }
 
     public function model()
@@ -130,9 +129,11 @@ public function model()
         return new $class();
     }
 
-    protected function getClosureNewUUID(): Literal
+    public static function getClosureNewUUID(): \Closure
     {
-        return new Literal("X'" . $this->repository->getDbDriver()->getScalar("SELECT hex(uuid_to_bin(uuid()))") . "'");
+        return function () {
+            return new Literal("X'" . Psr11::container()->get(DbDriverInterface::class)->getScalar("SELECT hex(uuid_to_bin(uuid()))") . "'");
+        };
     }
 
     public static function getUuid()
diff --git a/src/Repository/DummyHexRepository.php b/src/Repository/DummyHexRepository.php
index 75aa013..aaae36e 100644
--- a/src/Repository/DummyHexRepository.php
+++ b/src/Repository/DummyHexRepository.php
@@ -2,11 +2,9 @@
 
 namespace RestTemplate\Repository;
 
-use RestTemplate\Psr11;
 use ByJG\AnyDataset\Db\DbDriverInterface;
 use ByJG\MicroOrm\FieldMapping;
 use ByJG\MicroOrm\Mapper;
-use ByJG\MicroOrm\Query;
 use ByJG\MicroOrm\Repository;
 use RestTemplate\Model\DummyHex;
 
@@ -25,9 +23,7 @@ public function __construct(DbDriverInterface $dbDriver)
             'dummyhex',
             'id'
         );
-        $mapper->withPrimaryKeySeedFunction(function () {
-            return $this->getClosureNewUUID();
-        });
+        $mapper->withPrimaryKeySeedFunction(BaseRepository::getClosureNewUUID());
 
 
         $this->setClosureFixBinaryUUID($mapper);
diff --git a/src/Repository/UserDefinition.php b/src/Repository/UserDefinition.php
new file mode 100644
index 0000000..336a7b4
--- /dev/null
+++ b/src/Repository/UserDefinition.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace RestTemplate\Repository;
+
+use ByJG\AnyDataset\Db\DbDriverInterface;
+use ByJG\Authenticate\Model\UserModel;
+use ByJG\MicroOrm\Literal;
+use RestTemplate\Psr11;
+use RestTemplate\Util\HexUuidLiteral;
+
+class UserDefinition extends \ByJG\Authenticate\Definition\UserDefinition
+{
+    public function __construct($table = 'users', $model = UserModel::class, $loginField = self::LOGIN_IS_USERNAME, $fieldDef = [])
+    {
+        parent::__construct($table, $model, $loginField, $fieldDef);
+
+        $this->markPropertyAsReadOnly("uuid");
+        $this->markPropertyAsReadOnly("created");
+        $this->markPropertyAsReadOnly("updated");
+        $this->defineGenerateKeyClosure(function () {
+                    return new Literal("X'" . Psr11::container()->get(DbDriverInterface::class)->getScalar("SELECT hex(uuid_to_bin(uuid()))") . "'");
+                }
+        );
+
+        $this->defineClosureForSelect(
+            "userid",
+            function ($value, $instance) {
+                if (!method_exists($instance, 'getUuid')) {
+                    return $value;
+                }
+                if (!empty($instance->getUuid())) {
+                    return $instance->getUuid();
+                }
+                return $value;
+            }
+        );
+
+        $this->defineClosureForUpdate(
+            'userid',
+            function ($value, $instance) {
+                if (empty($value)) {
+                    return null;
+                }
+                if (!($value instanceof Literal)) {
+                    $value = new HexUuidLiteral($value);
+                }
+                return $value;
+            }
+        );
+    }
+
+}
\ No newline at end of file
diff --git a/src/Rest/Login.php b/src/Rest/Login.php
index 254eea2..a41d066 100644
--- a/src/Rest/Login.php
+++ b/src/Rest/Login.php
@@ -2,25 +2,14 @@
 
 namespace RestTemplate\Rest;
 
-use ByJG\Authenticate\Exception\UserExistsException;
 use ByJG\Authenticate\UsersDBDataset;
-use ByJG\Config\Exception\ConfigException;
-use ByJG\Config\Exception\ConfigNotFoundException;
-use ByJG\Config\Exception\DependencyInjectionException;
-use ByJG\Config\Exception\InvalidDateException;
-use ByJG\Config\Exception\KeyNotFoundException;
 use ByJG\Mail\Wrapper\MailWrapperInterface;
-use ByJG\MicroOrm\Exception\OrmBeforeInvalidException;
-use ByJG\MicroOrm\Exception\OrmInvalidFieldsException;
-use ByJG\RestServer\Exception\Error400Exception;
 use ByJG\RestServer\Exception\Error401Exception;
 use ByJG\RestServer\Exception\Error422Exception;
 use ByJG\RestServer\HttpRequest;
 use ByJG\RestServer\HttpResponse;
 use ByJG\RestServer\ResponseBag;
-use ByJG\Serializer\Exception\InvalidArgumentException;
 use OpenApi\Attributes as OA;
-use ReflectionException;
 use RestTemplate\Model\User;
 use RestTemplate\Psr11;
 use RestTemplate\Repository\BaseRepository;
@@ -31,18 +20,6 @@ class Login extends ServiceAbstractBase
     /**
      * Do login
      *
-     * @param HttpResponse $response
-     * @param HttpRequest $request
-     * @throws ConfigException
-     * @throws ConfigNotFoundException
-     * @throws DependencyInjectionException
-     * @throws Error400Exception
-     * @throws Error401Exception
-     * @throws InvalidArgumentException
-     * @throws InvalidDateException
-     * @throws KeyNotFoundException
-     * @throws \Psr\SimpleCache\InvalidArgumentException
-     * @throws ReflectionException
      */
     #[OA\Post(
         path: "/login",
@@ -92,17 +69,6 @@ public function post(HttpResponse $response, HttpRequest $request)
     /**
      * Refresh Token
      *
-     * @param HttpResponse $response
-     * @param HttpRequest $request
-     * @throws ConfigException
-     * @throws ConfigNotFoundException
-     * @throws DependencyInjectionException
-     * @throws Error401Exception
-     * @throws InvalidArgumentException
-     * @throws InvalidDateException
-     * @throws KeyNotFoundException
-     * @throws \Psr\SimpleCache\InvalidArgumentException
-     * @throws ReflectionException
      */
     #[OA\Post(
         path: "/refreshtoken",
@@ -145,30 +111,16 @@ public function refreshToken(HttpResponse $response, HttpRequest $request)
         $user = $users->getById(new HexUuidLiteral($result["data"]["userid"]));
 
         $metadata = $this->createUserMetadata($user);
-        
+
         $response->getResponseBag()->setSerializationRule(ResponseBag::SINGLE_OBJECT);
         $response->write(['token' => $this->createToken($metadata)]);
         $response->write(['data' => $metadata]);
-       
+
     }
 
     /**
      * Initialize the Password Request
      *
-     * @param HttpResponse $response
-     * @param HttpRequest $request
-     * @throws ConfigException
-     * @throws ConfigNotFoundException
-     * @throws DependencyInjectionException
-     * @throws Error400Exception
-     * @throws InvalidArgumentException
-     * @throws InvalidDateException
-     * @throws KeyNotFoundException
-     * @throws OrmBeforeInvalidException
-     * @throws OrmInvalidFieldsException
-     * @throws UserExistsException
-     * @throws \Psr\SimpleCache\InvalidArgumentException
-     * @throws ReflectionException
      */
     #[OA\Post(
         path: "/login/resetrequest",
@@ -206,10 +158,10 @@ public function postResetRequest(HttpResponse $response, HttpRequest $request)
         $code = rand(10000, 99999);
 
         if (!is_null($user)) {
-            $user->set('resettoken', $token);
-            $user->set('resettokenexpire', date('Y-m-d H:i:s', strtotime('+10 minutes')));
-            $user->set("resetcode", $code);
-            $user->set("resetallowed", null);
+            $user->set(User::PROP_RESETTOKEN, $token);
+            $user->set(User::PROP_RESETTOKENEXPIRE, date('Y-m-d H:i:s', strtotime('+10 minutes')));
+            $user->set(User::PROP_RESETCODE, $code);
+            $user->set(User::PROP_RESETALLOWED, null);
             $users->save($user);
 
             // Send email using MailWrapper
@@ -252,9 +204,6 @@ protected function validateResetToken($response, $request): array
     /**
      * Initialize the Password Request
      *
-     * @param HttpResponse $response
-     * @param HttpRequest $request
-     * @throws Error422Exception
      */
     #[OA\Post(
         path: "/login/confirmcode",
@@ -303,9 +252,6 @@ public function postConfirmCode(HttpResponse $response, HttpRequest $request)
     /**
      * Initialize the Password Request
      *
-     * @param HttpResponse $response
-     * @param HttpRequest $request
-     * @throws Error422Exception
      */
     #[OA\Post(
         path: "/login/resetpassword",
diff --git a/src/Rest/ServiceAbstractBase.php b/src/Rest/ServiceAbstractBase.php
index 3148bed..e1a6200 100644
--- a/src/Rest/ServiceAbstractBase.php
+++ b/src/Rest/ServiceAbstractBase.php
@@ -21,6 +21,7 @@
 use ReflectionException;
 use RestTemplate\Model\User;
 use RestTemplate\Psr11;
+use RestTemplate\Util\HexUuidLiteral;
 
 class ServiceAbstractBase
 {
@@ -39,8 +40,8 @@ protected function createUserMetadata(?UserModel $user): array
 
         return [
             'role' => ($user->getAdmin() === User::VALUE_YES ? User::ROLE_ADMIN : User::ROLE_USER),
-            'userid' => $user->getUserid(),
-            'name' => $user->getName()
+            'userid' => HexUuidLiteral::getFormattedUuid($user->getUserid()),
+            'name' => $user->getName(),
         ];
     }
 
@@ -128,10 +129,10 @@ public function validateRequest(HttpRequest $request)
 
         $path = $request->getRequestPath();
         $method = $request->server('REQUEST_METHOD');
-        
+
         // Returns a SwaggerRequestBody instance
         $bodyRequestDef = $schema->getRequestParameters($path, $method);
-        
+
         // Validate the request body (payload)
         if (str_contains($request->getHeader('Content-Type'), 'multipart/')) {
             $requestBody = $request->post();
diff --git a/templates/codegen/repository.php.jinja b/templates/codegen/repository.php.jinja
index 1843b96..1b4ca6a 100644
--- a/templates/codegen/repository.php.jinja
+++ b/templates/codegen/repository.php.jinja
@@ -25,9 +25,7 @@ class {{ className }}Repository extends BaseRepository
             '{{ tableName }}',
             'id'
         );
-        // $mapper->withPrimaryKeySeedFunction(function () {
-        //     return $this->getClosureNewUUID();
-        // });
+        // $mapper->withPrimaryKeySeedFunction(BaseRepository::getClosureNewUUID());
 
 
         // Table UUID Definition