diff --git a/composer.json b/composer.json
index ae32ffd..973ac42 100755
--- a/composer.json
+++ b/composer.json
@@ -29,7 +29,8 @@
     },
     "require-dev": {
         "squizlabs/php_codesniffer": "^3",
-        "phpstan/phpstan": "^0"
+        "phpstan/phpstan": "^0",
+        "davidlienhard/coding-standard": "^0"
     },
     "autoload": {
         "classmap": [
diff --git a/composer.lock b/composer.lock
index 0cb6816..d73a905 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "6cdb9da59637f652830bff19cc9960f2",
+    "content-hash": "9d91212eea4d98e476c2a79a8021fcb5",
     "packages": [
         {
             "name": "davidlienhard/database",
@@ -93,6 +93,170 @@
         }
     ],
     "packages-dev": [
+        {
+            "name": "davidlienhard/coding-standard",
+            "version": "0.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/davidlienhard/coding-standard.git",
+                "reference": "0ab8c0f4d1b7bd1b7dac903e80864b7e8134c573"
+            },
+            "dist": {
+                "type": "tar",
+                "url": "https://packages.tourbase.ch/dist/davidlienhard/coding-standard/davidlienhard-coding-standard-0ab8c0f4d1b7bd1b7dac903e80864b7e8134c573-zip-1f0ac8.tar",
+                "reference": "0ab8c0f4d1b7bd1b7dac903e80864b7e8134c573",
+                "shasum": "8f5824f301ff45421ed43e35a69fd658b7c3c08b"
+            },
+            "require": {
+                "php": "^8.0",
+                "slevomat/coding-standard": "^7",
+                "squizlabs/php_codesniffer": "^3"
+            },
+            "type": "phpcodesniffer-standard",
+            "scripts": {
+                "changed-files": [
+                    "git diff --name-only origin/master"
+                ]
+            },
+            "authors": [
+                {
+                    "name": "David Lienhard",
+                    "email": "david.lienhard@tourasia.ch",
+                    "homepage": "http://www.tourasia.ch/",
+                    "role": "Developer"
+                }
+            ],
+            "description": "DavidLienhard PHPCS Coding Standard",
+            "keywords": [
+                "CodeSniffer",
+                "phpcs"
+            ],
+            "support": {
+                "source": "https://github.com/davidlienhard/coding-standard",
+                "issues": "https://github.com/davidlienhard/coding-standard/issues"
+            },
+            "time": "2021-04-10T12:06:42+00:00"
+        },
+        {
+            "name": "dealerdirect/phpcodesniffer-composer-installer",
+            "version": "v0.7.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Dealerdirect/phpcodesniffer-composer-installer.git",
+                "reference": "fe390591e0241955f22eb9ba327d137e501c771c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Dealerdirect/phpcodesniffer-composer-installer/zipball/fe390591e0241955f22eb9ba327d137e501c771c",
+                "reference": "fe390591e0241955f22eb9ba327d137e501c771c",
+                "shasum": ""
+            },
+            "require": {
+                "composer-plugin-api": "^1.0 || ^2.0",
+                "php": ">=5.3",
+                "squizlabs/php_codesniffer": "^2.0 || ^3.0 || ^4.0"
+            },
+            "require-dev": {
+                "composer/composer": "*",
+                "phpcompatibility/php-compatibility": "^9.0",
+                "sensiolabs/security-checker": "^4.1.0"
+            },
+            "type": "composer-plugin",
+            "extra": {
+                "class": "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin"
+            },
+            "autoload": {
+                "psr-4": {
+                    "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Franck Nijhof",
+                    "email": "franck.nijhof@dealerdirect.com",
+                    "homepage": "http://www.frenck.nl",
+                    "role": "Developer / IT Manager"
+                }
+            ],
+            "description": "PHP_CodeSniffer Standards Composer Installer Plugin",
+            "homepage": "http://www.dealerdirect.com",
+            "keywords": [
+                "PHPCodeSniffer",
+                "PHP_CodeSniffer",
+                "code quality",
+                "codesniffer",
+                "composer",
+                "installer",
+                "phpcs",
+                "plugin",
+                "qa",
+                "quality",
+                "standard",
+                "standards",
+                "style guide",
+                "stylecheck",
+                "tests"
+            ],
+            "support": {
+                "issues": "https://github.com/dealerdirect/phpcodesniffer-composer-installer/issues",
+                "source": "https://github.com/dealerdirect/phpcodesniffer-composer-installer"
+            },
+            "time": "2020-12-07T18:04:37+00:00"
+        },
+        {
+            "name": "phpstan/phpdoc-parser",
+            "version": "0.5.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpstan/phpdoc-parser.git",
+                "reference": "e352d065af1ae9b41c12d1dfd309e90f7b1f55c9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/e352d065af1ae9b41c12d1dfd309e90f7b1f55c9",
+                "reference": "e352d065af1ae9b41c12d1dfd309e90f7b1f55c9",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1 || ^8.0"
+            },
+            "require-dev": {
+                "phing/phing": "^2.16.3",
+                "php-parallel-lint/php-parallel-lint": "^1.2",
+                "phpstan/extension-installer": "^1.0",
+                "phpstan/phpstan": "^0.12.60",
+                "phpstan/phpstan-strict-rules": "^0.12.5",
+                "phpunit/phpunit": "^7.5.20",
+                "symfony/process": "^5.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "0.5-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "PHPStan\\PhpDocParser\\": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "PHPDoc parser with support for nullable, intersection and generic types",
+            "support": {
+                "issues": "https://github.com/phpstan/phpdoc-parser/issues",
+                "source": "https://github.com/phpstan/phpdoc-parser/tree/0.5.4"
+            },
+            "time": "2021-04-03T14:46:19+00:00"
+        },
         {
             "name": "phpstan/phpstan",
             "version": "0.12.83",
@@ -153,6 +317,67 @@
             ],
             "time": "2021-04-03T15:35:45+00:00"
         },
+        {
+            "name": "slevomat/coding-standard",
+            "version": "7.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/slevomat/coding-standard.git",
+                "reference": "b4922c5ad5cbd3787c453a2eb1f6d540f2482198"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/b4922c5ad5cbd3787c453a2eb1f6d540f2482198",
+                "reference": "b4922c5ad5cbd3787c453a2eb1f6d540f2482198",
+                "shasum": ""
+            },
+            "require": {
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7",
+                "php": "^7.1 || ^8.0",
+                "phpstan/phpdoc-parser": "0.5.1 - 0.5.4",
+                "squizlabs/php_codesniffer": "^3.6.0"
+            },
+            "require-dev": {
+                "phing/phing": "2.16.4",
+                "php-parallel-lint/php-parallel-lint": "1.3.0",
+                "phpstan/phpstan": "0.12.83",
+                "phpstan/phpstan-deprecation-rules": "0.12.6",
+                "phpstan/phpstan-phpunit": "0.12.18",
+                "phpstan/phpstan-strict-rules": "0.12.9",
+                "phpunit/phpunit": "7.5.20|8.5.5|9.5.4"
+            },
+            "type": "phpcodesniffer-standard",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "6.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "SlevomatCodingStandard\\": "SlevomatCodingStandard"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Slevomat Coding Standard for PHP_CodeSniffer complements Consistence Coding Standard by providing sniffs with additional checks.",
+            "support": {
+                "issues": "https://github.com/slevomat/coding-standard/issues",
+                "source": "https://github.com/slevomat/coding-standard/tree/7.0.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/kukulich",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/slevomat/coding-standard",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-04-09T07:01:20+00:00"
+        },
         {
             "name": "squizlabs/php_codesniffer",
             "version": "3.6.0",
diff --git a/phpcs.xml b/phpcs.xml
index 1b3c2f0..1ff5616 100755
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -3,51 +3,14 @@
     <description>tourBase coding standard</description>
 
     <!-- inherit rules -->
-    <rule ref="PSR2" />
-
-    <!-- force use of short array syntax ([ ])-->
-    <rule ref="Generic.Arrays.DisallowLongArraySyntax.Found">
-        <type>error</type>
-    </rule>
-
-    <!-- check whitespaces before and after operators -->
-    <rule ref="Squiz.WhiteSpace.OperatorSpacing">
-        <properties>
-            <property name="ignoreNewlines" value="true" />
-        </properties>
-        <type>error</type>
-    </rule>
-
-    <!-- disallow and & or, force && and || -->
-    <rule ref="Squiz.Operators.ValidLogicalOperators">
-        <type>error</type>
-    </rule>
-
-    <!-- require strict types to be set -->
-    <rule ref="Generic.PHP.RequireStrictTypes">
-        <type>error</type>
-    </rule>
-
-    <!-- extend line limit to 180 -->
-    <rule ref="Generic.Files.LineLength">
-        <properties>
-            <property name="lineLimit" value="180"/>
-            <property name="absoluteLineLimit" value="0"/>
-        </properties>
+    <rule ref="DavidLienhard">
+        <exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingNativeTypeHint" />
+        <exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint" />
     </rule>
 
     <!-- Paths to check -->
     <file>src</file>
 
-    <!-- dont display warnings -->
-    <arg name="warning-severity" value="0"/>
-
-    <!-- parse only php files -->
-    <arg name="extensions" value="php"/>
-
-    <!-- show process -->
-    <arg value="p"/>
-
     <!-- folders / files to exclude -->
     <exclude-pattern>vendor/*</exclude-pattern>
 </ruleset>