diff --git a/.drone.yml b/.drone.yml
index 71c8d42..5657b70 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,75 +1,217 @@
 ---
 kind: pipeline
-name: Build
+name: php7.1
+
+volumes:
+- name: vendor
+  temp: {}
 
 steps:
-- name: Build
-  image: php:latest
+- name: install
+  image: php:7.1
+  volumes:
+  - name: vendor
+    path: /drone/src/vendor
   commands:
-  - chmod +x prepare.sh && ./prepare.sh
+  - apt-get update -yqq
+  - apt-get install -yqq git zip
+  - cd vendor
+  - curl -sS https://getcomposer.org/installer | php
+  - cd ../
+  - php vendor/composer.phar install
+
+- name: Tests
+  image: php:7.1
+  commands:
+  - pecl install xdebug
+  - docker-php-ext-enable xdebug
+  - php vendor/composer.phar run phpunit
+  - php vendor/composer.phar run phpstan
+  environment:
+    CODACY_PROJECT_TOKEN:
+      from_secret: CODACY_PROJECT_TOKEN
+  volumes:
+  - name: vendor
+    path: ./vendor
+steps:
+- name: install
+  image: php:7.1
+  volumes:
+  - name: vendor
+    path: /drone/src/vendor
+  commands:
+  - apt-get update -yqq
+  - apt-get install -yqq git zip
+  - cd vendor
+  - curl -sS https://getcomposer.org/installer | php
+  - cd ../
+  - php vendor/composer.phar install
+
+- name: Tests
+  image: php:7.1
+  commands:
+  - pecl install xdebug
+  - docker-php-ext-enable xdebug
+  - php vendor/composer.phar run phpunit
+  - php vendor/composer.phar run phpstan
+  environment:
+    CODACY_PROJECT_TOKEN:
+      from_secret: CODACY_PROJECT_TOKEN
+  volumes:
+  - name: vendor
+    path: /drone/src/vendor
+
+- name: Code Quality
+  image: php:7.1
+  commands:
+  - php vendor/composer.phar run phpmd
+  - php vendor/composer.phar run phpcs
+  volumes:
+  - name: vendor
+    path: /drone/src/vendor
 
 ---
 kind: pipeline
-name: Test
+name: php7.2
 
-depends_on:
-  - Build
+volumes:
+- name: vendor
+  temp: {}
 
 steps:
-- name: PHP Unit
-  image: php:latest
+- name: install
+  image: php:7.2
+  volumes:
+  - name: vendor
+    path: /drone/src/vendor
   commands:
-  - chmod +x prepare.sh && ./prepare.sh
-  - php composer.phar run phpunit
+  - apt-get update -yqq
+  - apt-get install -yqq git zip
+  - cd vendor
+  - curl -sS https://getcomposer.org/installer | php
+  - cd ../
+  - php vendor/composer.phar install
+
+- name: Tests
+  image: php:7.2
+  commands:
+  - pecl install xdebug
+  - docker-php-ext-enable xdebug
+  - php vendor/composer.phar run phpunit
+  - php vendor/composer.phar run phpstan
+  environment:
+    CODACY_PROJECT_TOKEN:
+      from_secret: CODACY_PROJECT_TOKEN
+  volumes:
+  - name: vendor
+    path: /drone/src/vendor
+
+- name: Code Quality
+  image: php:7.2
+  commands:
+  - php vendor/composer.phar run phpmd
+  - php vendor/composer.phar run phpcs
+  volumes:
+  - name: vendor
+    path: /drone/src/vendor
+
+---
+kind: pipeline
+name: php7.3
+
+volumes:
+- name: vendor
+  temp: {}
+
+steps:
+- name: install
+  image: php:7.3
+  volumes:
+  - name: vendor
+    path: /drone/src/vendor
+  commands:
+  - apt-get update -yqq
+  - apt-get install -yqq git zip
+  - cd vendor
+  - curl -sS https://getcomposer.org/installer | php
+  - cd ../
+  - php vendor/composer.phar install
+
+- name: Tests
+  image: php:7.3
+  commands:
+  - apt-get update -yqq
+  - apt-get install -yqq git
+  - pecl install xdebug
+  - docker-php-ext-enable xdebug
+  - php vendor/composer.phar run phpunit
+  - php vendor/composer.phar run phpstan
   - vendor/bin/codacycoverage clover tmp/code-coverage.xml
   environment:
     CODACY_PROJECT_TOKEN:
       from_secret: CODACY_PROJECT_TOKEN
+  volumes:
+  - name: vendor
+    path: /drone/src/vendor
 
-- name: PHPStan
-  image: php:latest
+- name: Code Quality
+  image: php:7.3
   commands:
-  - chmod +x prepare.sh && ./prepare.sh
-  - php composer.phar run phpstan
-
----
-kind: pipeline
-name: Code Quality
-
-depends_on:
-  - Build
-
-steps:
-- name: PHP Code Sniffer
-  image: php:latest
-  commands:
-  - chmod +x prepare.sh && ./prepare.sh
-  - php composer.phar run phpcs
-- name: PHP Mess Detector
-  image: php:latest
-  commands:
-  - chmod +x prepare.sh && ./prepare.sh
-  - php composer.phar run phpmd
-
+  - php vendor/composer.phar run phpmd
+  - php vendor/composer.phar run phpcs
+  volumes:
+  - name: vendor
+    path: /drone/src/vendor
 
 ---
 kind: pipeline
 name: Package
 
 depends_on:
-  - Code Quality
-  - Test
+  - php7.1
+  - php7.2
+  - php7.3
+
+volumes:
+- name: vendor
+  temp: {}
+- name: tmp
+  temp: {}
 
 steps:
-- name: prod
-  image: php:latest
+- name: install
+  image: php:7.3
+  volumes:
+  - name: vendor
+    path: /drone/src/vendor
+  - name: tmp
+    path: /drone/src/tmp
   commands:
-  - chmod +x prepare.sh && ./prepare.sh
-  - php composer.phar install --no-dev --optimize-autoloader
+  - apt-get update -yqq
+  - apt-get install -yqq git zip
+  - cd tmp
+  - curl -sS https://getcomposer.org/installer | php
+  - cd ../
+  - php tmp/composer.phar install --no-dev --optimize-autoloader
+  when:
+    event: tag
+
+- name: compress
+  image: php:7.3
+  commands:
+  - apt-get update -yqq
+  - apt-get install -yqq zip tar
   - cat production.txt | zip DeltaCMS.zip -r -@
   - tar -cvzf DeltaCMS.tar.gz -T production.txt
   when:
     event: tag
+  volumes:
+  - name: vendor
+    path: /drone/src/vendor
+  - name: tmp
+    path: /drone/src/tmp
+  when:
+    event: tag
 
 - name: release
   image: plugins/gitea-release
@@ -85,3 +227,8 @@ steps:
       - sha1
   when:
     event: tag
+  volumes:
+  - name: vendor
+    path: /drone/src/vendor
+  - name: tmp
+    path: /drone/src/tmp
diff --git a/composer.json b/composer.json
index 3784717..54bd4b7 100644
--- a/composer.json
+++ b/composer.json
@@ -27,6 +27,7 @@
 		}
 	},
     "require": {
+		"php": "^7.1",
         "twig/twig": "^2.7",
         "psr/simple-cache": "^1.0",
         "psr/log": "^1.1",
@@ -35,7 +36,7 @@
     "require-dev": {
         "squizlabs/php_codesniffer": "^3.4",
         "symfony/var-dumper": "^4.2",
-        "phpunit/phpunit": "^8.1",
+        "phpunit/phpunit": "7.*",
         "codacy/coverage": "^1.4",
         "phpmd/phpmd": "^2.6",
         "phpstan/phpstan": "^0.11.5"
diff --git a/composer.lock b/composer.lock
index 41bc767..651e023 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": "d2593f474195de1567aa4f07a903073d",
+    "content-hash": "82545b2e091a08b689f20a9176898ca4",
     "packages": [
         {
             "name": "doctrine/annotations",
@@ -2706,40 +2706,40 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "7.0.3",
+            "version": "6.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "0317a769a81845c390e19684d9ba25d7f6aa4707"
+                "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/0317a769a81845c390e19684d9ba25d7f6aa4707",
-                "reference": "0317a769a81845c390e19684d9ba25d7f6aa4707",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/807e6013b00af69b6c5d9ceb4282d0393dbb9d8d",
+                "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-xmlwriter": "*",
-                "php": "^7.2",
-                "phpunit/php-file-iterator": "^2.0.2",
+                "php": "^7.1",
+                "phpunit/php-file-iterator": "^2.0",
                 "phpunit/php-text-template": "^1.2.1",
-                "phpunit/php-token-stream": "^3.0.1",
+                "phpunit/php-token-stream": "^3.0",
                 "sebastian/code-unit-reverse-lookup": "^1.0.1",
-                "sebastian/environment": "^4.1",
+                "sebastian/environment": "^3.1 || ^4.0",
                 "sebastian/version": "^2.0.1",
                 "theseer/tokenizer": "^1.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.0"
+                "phpunit/phpunit": "^7.0"
             },
             "suggest": {
-                "ext-xdebug": "^2.6.1"
+                "ext-xdebug": "^2.6.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "7.0-dev"
+                    "dev-master": "6.1-dev"
                 }
             },
             "autoload": {
@@ -2765,7 +2765,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2019-02-26T07:38:26+00:00"
+            "time": "2018-10-31T16:06:48+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -2958,16 +2958,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "8.1.3",
+            "version": "7.5.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "2a676677982b484ee36b54961f570c02eabbe7e1"
+                "reference": "134669cf0eeac3f79bc7f0c793efbc158bffc160"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2a676677982b484ee36b54961f570c02eabbe7e1",
-                "reference": "2a676677982b484ee36b54961f570c02eabbe7e1",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/134669cf0eeac3f79bc7f0c793efbc158bffc160",
+                "reference": "134669cf0eeac3f79bc7f0c793efbc158bffc160",
                 "shasum": ""
             },
             "require": {
@@ -2977,25 +2977,27 @@
                 "ext-libxml": "*",
                 "ext-mbstring": "*",
                 "ext-xml": "*",
-                "ext-xmlwriter": "*",
                 "myclabs/deep-copy": "^1.7",
                 "phar-io/manifest": "^1.0.2",
                 "phar-io/version": "^2.0",
-                "php": "^7.2",
+                "php": "^7.1",
                 "phpspec/prophecy": "^1.7",
-                "phpunit/php-code-coverage": "^7.0",
+                "phpunit/php-code-coverage": "^6.0.7",
                 "phpunit/php-file-iterator": "^2.0.1",
                 "phpunit/php-text-template": "^1.2.1",
                 "phpunit/php-timer": "^2.1",
                 "sebastian/comparator": "^3.0",
                 "sebastian/diff": "^3.0",
-                "sebastian/environment": "^4.1",
+                "sebastian/environment": "^4.0",
                 "sebastian/exporter": "^3.1",
-                "sebastian/global-state": "^3.0",
+                "sebastian/global-state": "^2.0",
                 "sebastian/object-enumerator": "^3.0.3",
                 "sebastian/resource-operations": "^2.0",
                 "sebastian/version": "^2.0.1"
             },
+            "conflict": {
+                "phpunit/phpunit-mock-objects": "*"
+            },
             "require-dev": {
                 "ext-pdo": "*"
             },
@@ -3010,7 +3012,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "8.1-dev"
+                    "dev-master": "7.5-dev"
                 }
             },
             "autoload": {
@@ -3036,7 +3038,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2019-04-19T15:52:00+00:00"
+            "time": "2019-04-19T15:50:46+00:00"
         },
         {
             "name": "psr/container",
@@ -3374,26 +3376,23 @@
         },
         {
             "name": "sebastian/global-state",
-            "version": "3.0.0",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "edf8a461cf1d4005f19fb0b6b8b95a9f7fa0adc4"
+                "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/edf8a461cf1d4005f19fb0b6b8b95a9f7fa0adc4",
-                "reference": "edf8a461cf1d4005f19fb0b6b8b95a9f7fa0adc4",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4",
+                "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2",
-                "sebastian/object-reflector": "^1.1.1",
-                "sebastian/recursion-context": "^3.0"
+                "php": "^7.0"
             },
             "require-dev": {
-                "ext-dom": "*",
-                "phpunit/phpunit": "^8.0"
+                "phpunit/phpunit": "^6.0"
             },
             "suggest": {
                 "ext-uopz": "*"
@@ -3401,7 +3400,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
@@ -3424,7 +3423,7 @@
             "keywords": [
                 "global state"
             ],
-            "time": "2019-02-01T05:30:01+00:00"
+            "time": "2017-04-27T15:39:26+00:00"
         },
         {
             "name": "sebastian/object-enumerator",
@@ -4219,6 +4218,8 @@
     "stability-flags": [],
     "prefer-stable": false,
     "prefer-lowest": false,
-    "platform": [],
+    "platform": {
+        "php": "^7.1"
+    },
     "platform-dev": []
 }
diff --git a/prepare.sh b/prepare.sh
deleted file mode 100644
index d3d084a..0000000
--- a/prepare.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#/bin/bash
-
-apt-get update -yqq
-apt-get install -yqq zip tar git
-docker-php-ext-install json
-pecl install xdebug
-docker-php-ext-enable xdebug
-curl -sS https://getcomposer.org/installer | php
-php composer.phar install