diff --git a/Config/phpcs.xml b/Config/phpcs.xml
index 56ffa80..6ba463d 100755
--- a/Config/phpcs.xml
+++ b/Config/phpcs.xml
@@ -95,7 +95,7 @@
         <property name="absoluteNestingLevel" value="11"/>
     </properties>
      <exclude-pattern>*EigenvalueDecomposition.php</exclude-pattern><!-- Algorithm uses deep nesting -->
-     <exclude-pattern>*phpOMS/Message/Http/Request.php</exclude-pattern><!-- Multipart uses deep nesting -->
+     <exclude-pattern>*phpOMS/Message/Http/HttpRequest.php</exclude-pattern><!-- Multipart uses deep nesting -->
      <exclude-pattern>*WebRouter.php</exclude-pattern><!-- WebRouter uses deep nesting -->
 </rule>
 <rule ref="Generic.PHP.RequireStrictTypes"/>
diff --git a/Config/phpstan-baseline.neon b/Config/phpstan-baseline.neon
index 099b0e0..40e22f7 100644
--- a/Config/phpstan-baseline.neon
+++ b/Config/phpstan-baseline.neon
@@ -12,6 +12,11 @@ parameters:
 			count: 2
 			path: Install/ConsoleApplication.php
 
+		-
+			message: "#^Call to an undefined method phpOMS\\\\Message\\\\HeaderAbstract\\:\\:push\\(\\)\\.$#"
+			count: 1
+			path: Install/WebApplication.php
+
 		-
 			message: "#^Call to an undefined method phpOMS\\\\Router\\\\RouterInterface\\:\\:add\\(\\)\\.$#"
 			count: 2
@@ -407,11 +412,6 @@ parameters:
 			count: 1
 			path: Modules/HumanResourceManagement/Models/Employee.php
 
-		-
-			message: "#^Static property Modules\\\\HumanResourceManagement\\\\Models\\\\EmployeeMapper\\:\\:\\$columns \\(array\\<string, array\\<string, bool\\|string\\>\\>\\) does not accept default value of type array\\<string, array\\<string, array\\<string, true\\>\\|string\\>\\>\\.$#"
-			count: 1
-			path: Modules/HumanResourceManagement/Models/EmployeeMapper.php
-
 		-
 			message: "#^Property Modules\\\\HumanResourceManagement\\\\Models\\\\StaffList\\:\\:\\$dbPool has unknown class phpOMS\\\\DataStorage\\\\Database\\\\Pool as its type\\.$#"
 			count: 1
@@ -682,11 +682,6 @@ parameters:
 			count: 3
 			path: Modules/Tag/Controller/ApiController.php
 
-		-
-			message: "#^Array has 2 duplicate keys with value 'tag_color' \\('tag_color', 'tag_color'\\)\\.$#"
-			count: 1
-			path: Modules/Tag/Models/TagMapper.php
-
 		-
 			message: "#^PHPDoc tag @return with type void is incompatible with native type int\\.$#"
 			count: 1
@@ -802,6 +797,11 @@ parameters:
 			count: 1
 			path: Web/Api/Application.php
 
+		-
+			message: "#^Call to an undefined method phpOMS\\\\Message\\\\HeaderAbstract\\:\\:push\\(\\)\\.$#"
+			count: 1
+			path: Web/WebApplication.php
+
 		-
 			message: "#^Cannot call method getTimestamp\\(\\) on DateTime\\|null\\.$#"
 			count: 2
@@ -852,11 +852,6 @@ parameters:
 			count: 3
 			path: phpOMS/Algorithm/PathFinding/JumpPointSearch.php
 
-		-
-			message: "#^Binary operation \"\\+\\=\" between array\\<int\\|string, mixed\\> and array\\|false results in an error\\.$#"
-			count: 1
-			path: phpOMS/Config/SettingsAbstract.php
-
 		-
 			message: "#^Function setcookie invoked with 8 parameters, 1\\-7 required\\.$#"
 			count: 1
@@ -998,9 +993,9 @@ parameters:
 			path: phpOMS/Math/Statistic/MeasureOfDispersion.php
 
 		-
-			message: "#^Method phpOMS\\\\Message\\\\Console\\\\Request\\:\\:getMethod\\(\\) should return string but returns array\\|string\\.$#"
+			message: "#^Method phpOMS\\\\Message\\\\Console\\\\ConsoleRequest\\:\\:getMethod\\(\\) should return string but returns array\\|string\\.$#"
 			count: 1
-			path: phpOMS/Message/Console/Request.php
+			path: phpOMS/Message/Console/ConsoleRequest.php
 
 		-
 			message: "#^Method phpOMS\\\\Message\\\\Mail\\\\EmailAbstract\\:\\:decode\\(\\) should return string but returns string\\|false\\.$#"
@@ -1047,36 +1042,6 @@ parameters:
 			count: 1
 			path: phpOMS/Message/Mail/Mail.php
 
-		-
-			message: "#^Class phpOMS\\\\Message\\\\Socket\\\\Request constructor invoked with 1 parameter, 0 required\\.$#"
-			count: 1
-			path: phpOMS/Message/Socket/PacketManager.php
-
-		-
-			message: "#^Call to static method stringify\\(\\) on an unknown class phpOMS\\\\Message\\\\Socket\\\\StringUtils\\.$#"
-			count: 1
-			path: phpOMS/Message/Socket/Response.php
-
-		-
-			message: "#^Class phpOMS\\\\Message\\\\Socket\\\\View not found\\.$#"
-			count: 1
-			path: phpOMS/Message/Socket/Response.php
-
-		-
-			message: "#^Call to method toArray\\(\\) on an unknown class phpOMS\\\\Message\\\\Socket\\\\View\\.$#"
-			count: 1
-			path: phpOMS/Message/Socket/Response.php
-
-		-
-			message: "#^Call to static method getInstance\\(\\) on an unknown class phpOMS\\\\Message\\\\Socket\\\\FileLogger\\.$#"
-			count: 1
-			path: phpOMS/Message/Socket/Response.php
-
-		-
-			message: "#^Access to constant MSG_FULL on an unknown class phpOMS\\\\Message\\\\Socket\\\\FileLogger\\.$#"
-			count: 1
-			path: phpOMS/Message/Socket/Response.php
-
 		-
 			message: "#^Call to an undefined method phpOMS\\\\Message\\\\RequestAbstract\\:\\:getHash\\(\\)\\.$#"
 			count: 1
diff --git a/minimumSetup.php b/minimumSetup.php
index ec99266..6a8a3b6 100644
--- a/minimumSetup.php
+++ b/minimumSetup.php
@@ -12,9 +12,9 @@ error_reporting(E_ALL);
 require_once __DIR__ . '/../phpOMS/Autoloader.php';
 
 use Install\WebApplication;
-use phpOMS\Message\Http\Request;
+use phpOMS\Message\Http\HttpRequest;
 use phpOMS\Message\Http\RequestMethod;
-use phpOMS\Message\Http\Response;
+use phpOMS\Message\Http\HttpResponse;
 use phpOMS\Uri\Http;
 
 $config   = [
@@ -131,8 +131,8 @@ $db->exec('DROP DATABASE IF EXISTS ' . $config['db']['core']['masters']['admin']
 $db->exec('CREATE DATABASE IF NOT EXISTS ' . $config['db']['core']['masters']['admin']['database']);
 $db = null;
 
-$response = new Response();
-$request  = new Request(new Http(''));
+$response = new HttpResponse();
+$request  = new HttpRequest(new Http(''));
 $request->setMethod(RequestMethod::POST);
 
 $request->setData('dbhost', $config['db']['core']['masters']['admin']['host']);