From 4ef89c509993560a05ccdb56d02e2884510ec2de Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Wed, 22 Feb 2017 23:19:29 +0100
Subject: [PATCH] Continued: - added "import" for ObjectFactory
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 application/tests/class_ApplicationHelper.php                  | 1 +
 inc/database/lib-local.php                                     | 3 +++
 inc/main/classes/actions/html/class_HtmlLoginProfileAction.php | 1 +
 inc/main/classes/class_BaseFrameworkSystem.php                 | 1 +
 inc/main/classes/commands/class_BaseCommand.php                | 1 +
 inc/main/classes/commands/html/class_HtmlConfirmCommand.php    | 1 +
 inc/main/classes/commands/html/class_HtmlHomeCommand.php       | 3 +++
 inc/main/classes/commands/html/class_HtmlLoginAreaCommand.php  | 1 +
 inc/main/classes/commands/html/class_HtmlLoginCommand.php      | 1 +
 .../classes/commands/html/class_HtmlLoginFailedCommand.php     | 3 +++
 inc/main/classes/commands/html/class_HtmlLogoutCommand.php     | 3 +++
 inc/main/classes/commands/html/class_HtmlLogoutDoneCommand.php | 3 +++
 inc/main/classes/commands/html/class_HtmlRegisterCommand.php   | 1 +
 inc/main/classes/commands/html/class_HtmlResendLinkCommand.php | 1 +
 inc/main/classes/commands/html/class_HtmlStatusCommand.php     | 3 +++
 inc/main/classes/console/class_ConsoleTools.php                | 1 +
 inc/main/classes/controller/class_BaseController.php           | 1 +
 .../controller/console/class_ConsoleDefaultNewsController.php  | 3 +++
 .../classes/controller/html/class_HtmlConfirmController.php    | 3 +++
 .../controller/html/class_HtmlDefaultNewsController.php        | 3 +++
 .../classes/controller/html/class_HtmlLogoutController.php     | 3 +++
 .../controller/html/login/class_HtmlLoginAreaController.php    | 3 +++
 .../image/captcha/class_ImageCodeCaptchaController.php         | 3 +++
 inc/main/classes/crypto/class_CryptoHelper.php                 | 1 +
 .../classes/database/backend/class_CachedLocalFileDatabase.php | 3 +++
 inc/main/classes/database/class_BaseDatabaseWrapper.php        | 1 +
 .../classes/database/frontend/class_UserDatabaseWrapper.php    | 1 +
 .../database/frontend/class_UserPointsDatabaseWrapper.php      | 1 +
 inc/main/classes/decorator/xml/class_XmlCompactorDecorator.php | 3 +++
 .../classes/discovery/payment/class_LocalPaymentDiscovery.php  | 1 +
 inc/main/classes/factories/cache/class_CacheFactory.php        | 3 +++
 inc/main/classes/factories/client/class_ClientFactory.php      | 1 +
 .../factories/database/class_DatabaseWrapperFactory.php        | 1 +
 inc/main/classes/factories/html/class_HtmlNewsFactory.php      | 3 +++
 .../classes/factories/index/class_FileStackIndexFactory.php    | 1 +
 inc/main/classes/factories/login/class_LoginFactory.php        | 1 +
 .../classes/factories/registry/class_SocketRegistryFactory.php | 1 +
 inc/main/classes/factories/stacks/class_FileStackFactory.php   | 2 +-
 inc/main/classes/factories/user/class_UserFactory.php          | 1 +
 .../classes/factories/xml/class_XmlTemplateEngineFactory.php   | 1 +
 inc/main/classes/feature/class_FrameworkFeature.php            | 1 +
 .../classes/file_directories/binary/class_BaseBinaryFile.php   | 3 +++
 .../classes/file_directories/io_stream/class_FileIoStream.php  | 1 +
 .../file_directories/text/input/class_BaseInputTextFile.php    | 3 +++
 .../file_directories/text/output/class_BaseOutputTextFile.php  | 3 +++
 inc/main/classes/filter/auth/class_UserAuthFilter.php          | 1 +
 inc/main/classes/filter/crypto/class_CaptchaEncryptFilter.php  | 3 +++
 .../classes/filter/payment/class_PaymentDiscoveryFilter.php    | 1 +
 .../filter/verifier/class_AccountPasswordVerifierFilter.php    | 1 +
 .../verifier/class_GraphicalCodeCaptchaVerifierFilter.php      | 3 +++
 inc/main/classes/handler/raw_data/class_BaseDataHandler.php    | 3 +++
 .../handler/raw_data/network/class_BaseRawDataHandler.php      | 3 +++
 inc/main/classes/handler/tasks/class_TaskHandler.php           | 3 +++
 inc/main/classes/helper/captcha/class_BaseCaptcha.php          | 1 +
 .../classes/helper/captcha/web/class_GraphicalCodeCaptcha.php  | 1 +
 inc/main/classes/helper/class_BaseHelper.php                   | 1 +
 inc/main/classes/helper/html/forms/class_HtmlFormHelper.php    | 1 +
 inc/main/classes/index/class_BaseIndex.php                     | 1 +
 inc/main/classes/listener/class_BaseListener.php               | 1 +
 inc/main/classes/listener/socket/class_SocketFileListener.php  | 3 +++
 inc/main/classes/lists/class_BaseList.php                      | 1 +
 inc/main/classes/menu/class_BaseMenu.php                       | 1 +
 inc/main/classes/points/class_UserPoints.php                   | 1 +
 inc/main/classes/reader/class_ConsoleNewsReader.php            | 1 +
 inc/main/classes/reader/class_DefaultNewsReader.php            | 1 +
 inc/main/classes/registration/class_BaseRegistration.php       | 1 +
 inc/main/classes/resolver/action/class_BaseActionResolver.php  | 3 +++
 .../classes/resolver/command/class_BaseCommandResolver.php     | 3 +++
 .../resolver/controller/class_BaseControllerResolver.php       | 3 +++
 inc/main/classes/stacker/file/class_BaseFileStack.php          | 3 +++
 inc/main/classes/template/class_BaseTemplateEngine.php         | 1 +
 inc/main/classes/template/image/class_ImageTemplateEngine.php  | 1 +
 inc/main/classes/template/menu/class_MenuTemplateEngine.php    | 1 +
 inc/main/classes/user/class_BaseUser.php                       | 1 +
 inc/main/classes/user/member/class_Member.php                  | 1 +
 inc/main/middleware/compressor/class_CompressorChannel.php     | 3 +++
 inc/main/middleware/debug/class_DebugMiddleware.php            | 3 +++
 inc/main/middleware/io/class_FileIoHandler.php                 | 1 +
 78 files changed, 140 insertions(+), 1 deletion(-)

diff --git a/application/tests/class_ApplicationHelper.php b/application/tests/class_ApplicationHelper.php
index 3d5e2c92..fdf74a81 100644
--- a/application/tests/class_ApplicationHelper.php
+++ b/application/tests/class_ApplicationHelper.php
@@ -5,6 +5,7 @@ namespace CoreFramework\Helper\Application;
 // Import framework stuff
 use CoreFramework\Manager\ManageableApplication;
 use CoreFramework\Object\BaseFrameworkSystem;
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Registry\Registerable;
 use CoreFramework\Registry\Generic\Registry;
 use CoreFramework\Template\CompileableTemplate;
diff --git a/inc/database/lib-local.php b/inc/database/lib-local.php
index b5223158..b365a9f3 100644
--- a/inc/database/lib-local.php
+++ b/inc/database/lib-local.php
@@ -1,4 +1,7 @@
 <?php
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * Initializes the local file database class
  *
diff --git a/inc/main/classes/actions/html/class_HtmlLoginProfileAction.php b/inc/main/classes/actions/html/class_HtmlLoginProfileAction.php
index a0742f68..e53e3ea1 100644
--- a/inc/main/classes/actions/html/class_HtmlLoginProfileAction.php
+++ b/inc/main/classes/actions/html/class_HtmlLoginProfileAction.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Action\Login;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Registry\Registerable;
 
 /**
diff --git a/inc/main/classes/class_BaseFrameworkSystem.php b/inc/main/classes/class_BaseFrameworkSystem.php
index 581d72d9..7a00da22 100644
--- a/inc/main/classes/class_BaseFrameworkSystem.php
+++ b/inc/main/classes/class_BaseFrameworkSystem.php
@@ -4,6 +4,7 @@ namespace CoreFramework\Object;
 
 // Import framework stuff
 use CoreFramework\Configuration\FrameworkConfiguration;
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Generic\FrameworkInterface;
 use CoreFramework\Loader\ClassLoader;
 use CoreFramework\Manager\ManageableApplication;
diff --git a/inc/main/classes/commands/class_BaseCommand.php b/inc/main/classes/commands/class_BaseCommand.php
index 5984c18c..7c09754c 100644
--- a/inc/main/classes/commands/class_BaseCommand.php
+++ b/inc/main/classes/commands/class_BaseCommand.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Command;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Object\BaseFrameworkSystem;
 
 /**
diff --git a/inc/main/classes/commands/html/class_HtmlConfirmCommand.php b/inc/main/classes/commands/html/class_HtmlConfirmCommand.php
index 1faae1b2..093d329b 100644
--- a/inc/main/classes/commands/html/class_HtmlConfirmCommand.php
+++ b/inc/main/classes/commands/html/class_HtmlConfirmCommand.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Command\Guest;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Registry\Generic\Registry;
 
 /**
diff --git a/inc/main/classes/commands/html/class_HtmlHomeCommand.php b/inc/main/classes/commands/html/class_HtmlHomeCommand.php
index b9538f8b..cddd93c9 100644
--- a/inc/main/classes/commands/html/class_HtmlHomeCommand.php
+++ b/inc/main/classes/commands/html/class_HtmlHomeCommand.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Command\Guest;
 
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A command for the home page
  *
diff --git a/inc/main/classes/commands/html/class_HtmlLoginAreaCommand.php b/inc/main/classes/commands/html/class_HtmlLoginAreaCommand.php
index 7c8bf3d5..fb328a50 100644
--- a/inc/main/classes/commands/html/class_HtmlLoginAreaCommand.php
+++ b/inc/main/classes/commands/html/class_HtmlLoginAreaCommand.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Command\Login;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Registry\Generic\Registry;
 
 /**
diff --git a/inc/main/classes/commands/html/class_HtmlLoginCommand.php b/inc/main/classes/commands/html/class_HtmlLoginCommand.php
index ccfafad2..8b8f18a1 100644
--- a/inc/main/classes/commands/html/class_HtmlLoginCommand.php
+++ b/inc/main/classes/commands/html/class_HtmlLoginCommand.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Command\Login;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Registry\Registerable;
 use CoreFramework\Registry\Generic\Registry;
 
diff --git a/inc/main/classes/commands/html/class_HtmlLoginFailedCommand.php b/inc/main/classes/commands/html/class_HtmlLoginFailedCommand.php
index 126a4240..8280940c 100644
--- a/inc/main/classes/commands/html/class_HtmlLoginFailedCommand.php
+++ b/inc/main/classes/commands/html/class_HtmlLoginFailedCommand.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Command\Failed;
 
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A command for the login failed page
  *
diff --git a/inc/main/classes/commands/html/class_HtmlLogoutCommand.php b/inc/main/classes/commands/html/class_HtmlLogoutCommand.php
index 121fb97b..9a42eba4 100644
--- a/inc/main/classes/commands/html/class_HtmlLogoutCommand.php
+++ b/inc/main/classes/commands/html/class_HtmlLogoutCommand.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Command\Login;
 
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A command for logout
  *
diff --git a/inc/main/classes/commands/html/class_HtmlLogoutDoneCommand.php b/inc/main/classes/commands/html/class_HtmlLogoutDoneCommand.php
index 4c81971b..d1a4bd91 100644
--- a/inc/main/classes/commands/html/class_HtmlLogoutDoneCommand.php
+++ b/inc/main/classes/commands/html/class_HtmlLogoutDoneCommand.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Command\Logout;
 
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A command for the login failed page
  *
diff --git a/inc/main/classes/commands/html/class_HtmlRegisterCommand.php b/inc/main/classes/commands/html/class_HtmlRegisterCommand.php
index 36a3c899..f473a35e 100644
--- a/inc/main/classes/commands/html/class_HtmlRegisterCommand.php
+++ b/inc/main/classes/commands/html/class_HtmlRegisterCommand.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Command\Register;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Registry\Registerable;
 use CoreFramework\Registry\Generic\Registry;
 
diff --git a/inc/main/classes/commands/html/class_HtmlResendLinkCommand.php b/inc/main/classes/commands/html/class_HtmlResendLinkCommand.php
index fe649116..618d344c 100644
--- a/inc/main/classes/commands/html/class_HtmlResendLinkCommand.php
+++ b/inc/main/classes/commands/html/class_HtmlResendLinkCommand.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Command\Guest;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Registry\Generic\Registry;
 
 /**
diff --git a/inc/main/classes/commands/html/class_HtmlStatusCommand.php b/inc/main/classes/commands/html/class_HtmlStatusCommand.php
index bae495d8..13d49f5c 100644
--- a/inc/main/classes/commands/html/class_HtmlStatusCommand.php
+++ b/inc/main/classes/commands/html/class_HtmlStatusCommand.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Command\Status;
 
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A command for Status page
  *
diff --git a/inc/main/classes/console/class_ConsoleTools.php b/inc/main/classes/console/class_ConsoleTools.php
index 0d57e341..4babb5e4 100644
--- a/inc/main/classes/console/class_ConsoleTools.php
+++ b/inc/main/classes/console/class_ConsoleTools.php
@@ -4,6 +4,7 @@ namespace CoreFramework\Tools;
 
 // Import framework stuff
 use CoreFramework\Configuration\FrameworkConfiguration;
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Object\BaseFrameworkSystem;
 
 /**
diff --git a/inc/main/classes/controller/class_BaseController.php b/inc/main/classes/controller/class_BaseController.php
index 35d6b47e..fcf97fce 100644
--- a/inc/main/classes/controller/class_BaseController.php
+++ b/inc/main/classes/controller/class_BaseController.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Controller;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Object\BaseFrameworkSystem;
 use CoreFramework\Registry\Generic\Registry;
 
diff --git a/inc/main/classes/controller/console/class_ConsoleDefaultNewsController.php b/inc/main/classes/controller/console/class_ConsoleDefaultNewsController.php
index 27ec6d79..aacb75b0 100644
--- a/inc/main/classes/controller/console/class_ConsoleDefaultNewsController.php
+++ b/inc/main/classes/controller/console/class_ConsoleDefaultNewsController.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Controller\Default;
 
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * The default controller with news for e.g. home or news page
  *
diff --git a/inc/main/classes/controller/html/class_HtmlConfirmController.php b/inc/main/classes/controller/html/class_HtmlConfirmController.php
index 6821591e..d79d53f8 100644
--- a/inc/main/classes/controller/html/class_HtmlConfirmController.php
+++ b/inc/main/classes/controller/html/class_HtmlConfirmController.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Controller\Confirm;
 
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * Controller for confirmation link
  *
diff --git a/inc/main/classes/controller/html/class_HtmlDefaultNewsController.php b/inc/main/classes/controller/html/class_HtmlDefaultNewsController.php
index 8a0ecd4f..4785f121 100644
--- a/inc/main/classes/controller/html/class_HtmlDefaultNewsController.php
+++ b/inc/main/classes/controller/html/class_HtmlDefaultNewsController.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Controller\News;
 
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * The default controller with news for e.g. home or news page
  *
diff --git a/inc/main/classes/controller/html/class_HtmlLogoutController.php b/inc/main/classes/controller/html/class_HtmlLogoutController.php
index 9f773c2b..8ebcf1bb 100644
--- a/inc/main/classes/controller/html/class_HtmlLogoutController.php
+++ b/inc/main/classes/controller/html/class_HtmlLogoutController.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Controller\Logout;
 
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * The default controller for logout page
  *
diff --git a/inc/main/classes/controller/html/login/class_HtmlLoginAreaController.php b/inc/main/classes/controller/html/login/class_HtmlLoginAreaController.php
index c90e570d..9ce112da 100644
--- a/inc/main/classes/controller/html/login/class_HtmlLoginAreaController.php
+++ b/inc/main/classes/controller/html/login/class_HtmlLoginAreaController.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Controller\Login;
 
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * Controller for login area with news
  *
diff --git a/inc/main/classes/controller/image/captcha/class_ImageCodeCaptchaController.php b/inc/main/classes/controller/image/captcha/class_ImageCodeCaptchaController.php
index bb6b554e..ece8e712 100644
--- a/inc/main/classes/controller/image/captcha/class_ImageCodeCaptchaController.php
+++ b/inc/main/classes/controller/image/captcha/class_ImageCodeCaptchaController.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Controller\Image\Captcha;
 
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A controller for a code-based CAPTCHA where the user has to repeat a shown code
  *
diff --git a/inc/main/classes/crypto/class_CryptoHelper.php b/inc/main/classes/crypto/class_CryptoHelper.php
index 9431ccc7..153f4d4f 100644
--- a/inc/main/classes/crypto/class_CryptoHelper.php
+++ b/inc/main/classes/crypto/class_CryptoHelper.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Helper\Crypto;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Object\BaseFrameworkSystem;
 
 /**
diff --git a/inc/main/classes/database/backend/class_CachedLocalFileDatabase.php b/inc/main/classes/database/backend/class_CachedLocalFileDatabase.php
index f39a866a..5c887e5b 100644
--- a/inc/main/classes/database/backend/class_CachedLocalFileDatabase.php
+++ b/inc/main/classes/database/backend/class_CachedLocalFileDatabase.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Database\Backend\Lfdb;
 
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * Database backend class for storing objects in locally created files.
  *
diff --git a/inc/main/classes/database/class_BaseDatabaseWrapper.php b/inc/main/classes/database/class_BaseDatabaseWrapper.php
index 9c3a3615..eade379b 100644
--- a/inc/main/classes/database/class_BaseDatabaseWrapper.php
+++ b/inc/main/classes/database/class_BaseDatabaseWrapper.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Database\Wrapper;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Object\BaseFrameworkSystem;
 
 /**
diff --git a/inc/main/classes/database/frontend/class_UserDatabaseWrapper.php b/inc/main/classes/database/frontend/class_UserDatabaseWrapper.php
index d72c4766..f0e935ed 100644
--- a/inc/main/classes/database/frontend/class_UserDatabaseWrapper.php
+++ b/inc/main/classes/database/frontend/class_UserDatabaseWrapper.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Database\Wrapper\User;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Registry\Registerable;
 
 /**
diff --git a/inc/main/classes/database/frontend/class_UserPointsDatabaseWrapper.php b/inc/main/classes/database/frontend/class_UserPointsDatabaseWrapper.php
index 9add3702..fa84cef5 100644
--- a/inc/main/classes/database/frontend/class_UserPointsDatabaseWrapper.php
+++ b/inc/main/classes/database/frontend/class_UserPointsDatabaseWrapper.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Database\Wrapper\Points;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Registry\Registerable;
 
 /**
diff --git a/inc/main/classes/decorator/xml/class_XmlCompactorDecorator.php b/inc/main/classes/decorator/xml/class_XmlCompactorDecorator.php
index 1163a245..152eb9fb 100644
--- a/inc/main/classes/decorator/xml/class_XmlCompactorDecorator.php
+++ b/inc/main/classes/decorator/xml/class_XmlCompactorDecorator.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Parser\Xml;
 
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A XML compacting decorator class for XML parsers
  *
diff --git a/inc/main/classes/discovery/payment/class_LocalPaymentDiscovery.php b/inc/main/classes/discovery/payment/class_LocalPaymentDiscovery.php
index bd43e942..88814f55 100644
--- a/inc/main/classes/discovery/payment/class_LocalPaymentDiscovery.php
+++ b/inc/main/classes/discovery/payment/class_LocalPaymentDiscovery.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Discovery\Payment;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Registry\Registerable;
 
 /**
diff --git a/inc/main/classes/factories/cache/class_CacheFactory.php b/inc/main/classes/factories/cache/class_CacheFactory.php
index e84be052..73a63d97 100644
--- a/inc/main/classes/factories/cache/class_CacheFactory.php
+++ b/inc/main/classes/factories/cache/class_CacheFactory.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Factory\Cache;
 
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A cache factory
  *
diff --git a/inc/main/classes/factories/client/class_ClientFactory.php b/inc/main/classes/factories/client/class_ClientFactory.php
index 81946476..2a49abac 100644
--- a/inc/main/classes/factories/client/class_ClientFactory.php
+++ b/inc/main/classes/factories/client/class_ClientFactory.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Factory\Client;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Registry\Generic\Registry;
 
 /**
diff --git a/inc/main/classes/factories/database/class_DatabaseWrapperFactory.php b/inc/main/classes/factories/database/class_DatabaseWrapperFactory.php
index 6ff43572..39a6668f 100644
--- a/inc/main/classes/factories/database/class_DatabaseWrapperFactory.php
+++ b/inc/main/classes/factories/database/class_DatabaseWrapperFactory.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Factory\Database\Wrapper;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Registry\Generic\Registry;
 
 /**
diff --git a/inc/main/classes/factories/html/class_HtmlNewsFactory.php b/inc/main/classes/factories/html/class_HtmlNewsFactory.php
index bbeee4fc..40051339 100644
--- a/inc/main/classes/factories/html/class_HtmlNewsFactory.php
+++ b/inc/main/classes/factories/html/class_HtmlNewsFactory.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Factory\News;
 
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A news factory for web pages
  *
diff --git a/inc/main/classes/factories/index/class_FileStackIndexFactory.php b/inc/main/classes/factories/index/class_FileStackIndexFactory.php
index 03faf785..32af8142 100644
--- a/inc/main/classes/factories/index/class_FileStackIndexFactory.php
+++ b/inc/main/classes/factories/index/class_FileStackIndexFactory.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Factory\Filesystem\Stack;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Registry\Generic\Registry;
 
 /**
diff --git a/inc/main/classes/factories/login/class_LoginFactory.php b/inc/main/classes/factories/login/class_LoginFactory.php
index f9b40da3..906f9b2f 100644
--- a/inc/main/classes/factories/login/class_LoginFactory.php
+++ b/inc/main/classes/factories/login/class_LoginFactory.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Factory\Login;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Registry\Generic\Registry;
 
 /**
diff --git a/inc/main/classes/factories/registry/class_SocketRegistryFactory.php b/inc/main/classes/factories/registry/class_SocketRegistryFactory.php
index 5ba31d05..70c2d0ee 100644
--- a/inc/main/classes/factories/registry/class_SocketRegistryFactory.php
+++ b/inc/main/classes/factories/registry/class_SocketRegistryFactory.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Factory\Registry;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Registry\Generic\Registry;
 
 /**
diff --git a/inc/main/classes/factories/stacks/class_FileStackFactory.php b/inc/main/classes/factories/stacks/class_FileStackFactory.php
index ca871fc6..4116b4e1 100644
--- a/inc/main/classes/factories/stacks/class_FileStackFactory.php
+++ b/inc/main/classes/factories/stacks/class_FileStackFactory.php
@@ -4,9 +4,9 @@ namespace CoreFramework\Factory\Stack;
 
 // Import framework stuff
 use CoreFramework\Configuration\FrameworkConfiguration;
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Registry\Generic\Registry;
 
-
 /**
  * A factory class for file-based stacks
  *
diff --git a/inc/main/classes/factories/user/class_UserFactory.php b/inc/main/classes/factories/user/class_UserFactory.php
index 15063868..89baee3d 100644
--- a/inc/main/classes/factories/user/class_UserFactory.php
+++ b/inc/main/classes/factories/user/class_UserFactory.php
@@ -4,6 +4,7 @@ namespace CoreFramework\Factory\User;
 
 // Import framework stuff
 use CoreFramework\Configuration\FrameworkConfiguration;
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Registry\Generic\Registry;
 
 /**
diff --git a/inc/main/classes/factories/xml/class_XmlTemplateEngineFactory.php b/inc/main/classes/factories/xml/class_XmlTemplateEngineFactory.php
index fdee7be8..7085ea5e 100644
--- a/inc/main/classes/factories/xml/class_XmlTemplateEngineFactory.php
+++ b/inc/main/classes/factories/xml/class_XmlTemplateEngineFactory.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Factory\Template;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Registry\Generic\Registry;
 
 /**
diff --git a/inc/main/classes/feature/class_FrameworkFeature.php b/inc/main/classes/feature/class_FrameworkFeature.php
index 616b4c3c..658cdbb4 100644
--- a/inc/main/classes/feature/class_FrameworkFeature.php
+++ b/inc/main/classes/feature/class_FrameworkFeature.php
@@ -4,6 +4,7 @@ namespace CoreFramework\Feature;
 
 // Import framework stuff
 use CoreFramework\Configuration\FrameworkConfiguration;
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Object\BaseFrameworkSystem;
 
 /**
diff --git a/inc/main/classes/file_directories/binary/class_BaseBinaryFile.php b/inc/main/classes/file_directories/binary/class_BaseBinaryFile.php
index 15b5f0b3..f346fb69 100644
--- a/inc/main/classes/file_directories/binary/class_BaseBinaryFile.php
+++ b/inc/main/classes/file_directories/binary/class_BaseBinaryFile.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Filesystem\File;
 
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A general binary file class
  *
diff --git a/inc/main/classes/file_directories/io_stream/class_FileIoStream.php b/inc/main/classes/file_directories/io_stream/class_FileIoStream.php
index 3de4520b..028009fb 100644
--- a/inc/main/classes/file_directories/io_stream/class_FileIoStream.php
+++ b/inc/main/classes/file_directories/io_stream/class_FileIoStream.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Stream\Filesystem;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Object\BaseFrameworkSystem;
 
 /**
diff --git a/inc/main/classes/file_directories/text/input/class_BaseInputTextFile.php b/inc/main/classes/file_directories/text/input/class_BaseInputTextFile.php
index 70d4ee14..a8ff8874 100644
--- a/inc/main/classes/file_directories/text/input/class_BaseInputTextFile.php
+++ b/inc/main/classes/file_directories/text/input/class_BaseInputTextFile.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Filesystem\Text;
 
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A general text input file class
  *
diff --git a/inc/main/classes/file_directories/text/output/class_BaseOutputTextFile.php b/inc/main/classes/file_directories/text/output/class_BaseOutputTextFile.php
index 57bb5f18..ea8f3682 100644
--- a/inc/main/classes/file_directories/text/output/class_BaseOutputTextFile.php
+++ b/inc/main/classes/file_directories/text/output/class_BaseOutputTextFile.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Filesystem\Text;
 
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A general text file class
  *
diff --git a/inc/main/classes/filter/auth/class_UserAuthFilter.php b/inc/main/classes/filter/auth/class_UserAuthFilter.php
index b11beb1d..8f60b855 100644
--- a/inc/main/classes/filter/auth/class_UserAuthFilter.php
+++ b/inc/main/classes/filter/auth/class_UserAuthFilter.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Filter\User\Auth;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Registry\Generic\Registry;
 
 /**
diff --git a/inc/main/classes/filter/crypto/class_CaptchaEncryptFilter.php b/inc/main/classes/filter/crypto/class_CaptchaEncryptFilter.php
index e13ca5ac..de8ac42c 100644
--- a/inc/main/classes/filter/crypto/class_CaptchaEncryptFilter.php
+++ b/inc/main/classes/filter/crypto/class_CaptchaEncryptFilter.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Filter\Captcha;
 
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A filter for checking if value "encrypt" is set and fine
  *
diff --git a/inc/main/classes/filter/payment/class_PaymentDiscoveryFilter.php b/inc/main/classes/filter/payment/class_PaymentDiscoveryFilter.php
index 70b03b99..6cc78313 100644
--- a/inc/main/classes/filter/payment/class_PaymentDiscoveryFilter.php
+++ b/inc/main/classes/filter/payment/class_PaymentDiscoveryFilter.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Filter\Discovery\Payment;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Registry\Generic\Registry;
 
 /**
diff --git a/inc/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php b/inc/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php
index f2459a71..164ff944 100644
--- a/inc/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php
+++ b/inc/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Filter\Verifier\Password;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Registry\Generic\Registry;
 
 /**
diff --git a/inc/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php b/inc/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php
index f7340b71..05b133bd 100644
--- a/inc/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php
+++ b/inc/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Filter\Verifier\Captcha;
 
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A concrete filter for validating code graphical CAPTCHAs with hashes
  *
diff --git a/inc/main/classes/handler/raw_data/class_BaseDataHandler.php b/inc/main/classes/handler/raw_data/class_BaseDataHandler.php
index a213ce32..d1212ee3 100644
--- a/inc/main/classes/handler/raw_data/class_BaseDataHandler.php
+++ b/inc/main/classes/handler/raw_data/class_BaseDataHandler.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Handler\Data;
 
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A general data Handler
  *
diff --git a/inc/main/classes/handler/raw_data/network/class_BaseRawDataHandler.php b/inc/main/classes/handler/raw_data/network/class_BaseRawDataHandler.php
index 2e1edd24..a762b449 100644
--- a/inc/main/classes/handler/raw_data/network/class_BaseRawDataHandler.php
+++ b/inc/main/classes/handler/raw_data/network/class_BaseRawDataHandler.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Handler\Raw;
 
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A general Handler for raw data from sockets
  *
diff --git a/inc/main/classes/handler/tasks/class_TaskHandler.php b/inc/main/classes/handler/tasks/class_TaskHandler.php
index 74f59c73..e44f40d2 100644
--- a/inc/main/classes/handler/tasks/class_TaskHandler.php
+++ b/inc/main/classes/handler/tasks/class_TaskHandler.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Handler\Task;
 
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A Task handler
  *
diff --git a/inc/main/classes/helper/captcha/class_BaseCaptcha.php b/inc/main/classes/helper/captcha/class_BaseCaptcha.php
index 8293b9b2..ce4ba7f9 100644
--- a/inc/main/classes/helper/captcha/class_BaseCaptcha.php
+++ b/inc/main/classes/helper/captcha/class_BaseCaptcha.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Captcha;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/classes/helper/captcha/web/class_GraphicalCodeCaptcha.php b/inc/main/classes/helper/captcha/web/class_GraphicalCodeCaptcha.php
index 513ae522..cee32d53 100644
--- a/inc/main/classes/helper/captcha/web/class_GraphicalCodeCaptcha.php
+++ b/inc/main/classes/helper/captcha/web/class_GraphicalCodeCaptcha.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Captcha;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
diff --git a/inc/main/classes/helper/class_BaseHelper.php b/inc/main/classes/helper/class_BaseHelper.php
index b9507506..192a51a1 100644
--- a/inc/main/classes/helper/class_BaseHelper.php
+++ b/inc/main/classes/helper/class_BaseHelper.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Helper;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Generic\FrameworkInterface;
 use CoreFramework\Object\BaseFrameworkSystem;
 use CoreFramework\Registry\Generic\Registry;
diff --git a/inc/main/classes/helper/html/forms/class_HtmlFormHelper.php b/inc/main/classes/helper/html/forms/class_HtmlFormHelper.php
index 7b6fc3aa..a190af63 100644
--- a/inc/main/classes/helper/html/forms/class_HtmlFormHelper.php
+++ b/inc/main/classes/helper/html/forms/class_HtmlFormHelper.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Helper;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Registry\Generic\Registry;
 use CoreFramework\Template\CompileableTemplate;
 
diff --git a/inc/main/classes/index/class_BaseIndex.php b/inc/main/classes/index/class_BaseIndex.php
index c6be8290..be4fe1fe 100644
--- a/inc/main/classes/index/class_BaseIndex.php
+++ b/inc/main/classes/index/class_BaseIndex.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Index;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Object\BaseFrameworkSystem;
 
 /**
diff --git a/inc/main/classes/listener/class_BaseListener.php b/inc/main/classes/listener/class_BaseListener.php
index 28f5fd64..920819b7 100644
--- a/inc/main/classes/listener/class_BaseListener.php
+++ b/inc/main/classes/listener/class_BaseListener.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Listener;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Object\BaseFrameworkSystem;
 
 /**
diff --git a/inc/main/classes/listener/socket/class_SocketFileListener.php b/inc/main/classes/listener/socket/class_SocketFileListener.php
index 81ad500a..eafa15c5 100644
--- a/inc/main/classes/listener/socket/class_SocketFileListener.php
+++ b/inc/main/classes/listener/socket/class_SocketFileListener.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Listener\Socket;
 
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A file-based socket listener
  *
diff --git a/inc/main/classes/lists/class_BaseList.php b/inc/main/classes/lists/class_BaseList.php
index e0bba6ba..5218382b 100644
--- a/inc/main/classes/lists/class_BaseList.php
+++ b/inc/main/classes/lists/class_BaseList.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Lists;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Generic\FrameworkInterface;
 use CoreFramework\Object\BaseFrameworkSystem;
 
diff --git a/inc/main/classes/menu/class_BaseMenu.php b/inc/main/classes/menu/class_BaseMenu.php
index 90da4c37..5ce3f3fc 100644
--- a/inc/main/classes/menu/class_BaseMenu.php
+++ b/inc/main/classes/menu/class_BaseMenu.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Menu;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Object\BaseFrameworkSystem;
 use CoreFramework\Template\CompileableTemplate;
 
diff --git a/inc/main/classes/points/class_UserPoints.php b/inc/main/classes/points/class_UserPoints.php
index a1c79f62..54424e1e 100644
--- a/inc/main/classes/points/class_UserPoints.php
+++ b/inc/main/classes/points/class_UserPoints.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\User\Point;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Object\BaseFrameworkSystem;
 
 /**
diff --git a/inc/main/classes/reader/class_ConsoleNewsReader.php b/inc/main/classes/reader/class_ConsoleNewsReader.php
index 9de20b50..f868002a 100644
--- a/inc/main/classes/reader/class_ConsoleNewsReader.php
+++ b/inc/main/classes/reader/class_ConsoleNewsReader.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Reader\News;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Object\BaseFrameworkSystem;
 use CoreFramework\Registry\Registerable;
 
diff --git a/inc/main/classes/reader/class_DefaultNewsReader.php b/inc/main/classes/reader/class_DefaultNewsReader.php
index 988a04f2..4173d84a 100644
--- a/inc/main/classes/reader/class_DefaultNewsReader.php
+++ b/inc/main/classes/reader/class_DefaultNewsReader.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Reader\News;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Object\BaseFrameworkSystem;
 use CoreFramework\Registry\Registerable;
 
diff --git a/inc/main/classes/registration/class_BaseRegistration.php b/inc/main/classes/registration/class_BaseRegistration.php
index 783d87a5..1ae0b959 100644
--- a/inc/main/classes/registration/class_BaseRegistration.php
+++ b/inc/main/classes/registration/class_BaseRegistration.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Registration;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Object\BaseFrameworkSystem;
 
 /**
diff --git a/inc/main/classes/resolver/action/class_BaseActionResolver.php b/inc/main/classes/resolver/action/class_BaseActionResolver.php
index c20410d3..cd6cd5e9 100644
--- a/inc/main/classes/resolver/action/class_BaseActionResolver.php
+++ b/inc/main/classes/resolver/action/class_BaseActionResolver.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Resolver\Action;
 
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A generic action resolver class
  *
diff --git a/inc/main/classes/resolver/command/class_BaseCommandResolver.php b/inc/main/classes/resolver/command/class_BaseCommandResolver.php
index 7bfa17a2..4e91fde1 100644
--- a/inc/main/classes/resolver/command/class_BaseCommandResolver.php
+++ b/inc/main/classes/resolver/command/class_BaseCommandResolver.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Resolver\Controller;
 
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A generic command resolver class
  *
diff --git a/inc/main/classes/resolver/controller/class_BaseControllerResolver.php b/inc/main/classes/resolver/controller/class_BaseControllerResolver.php
index 3f973885..e78aa7a1 100644
--- a/inc/main/classes/resolver/controller/class_BaseControllerResolver.php
+++ b/inc/main/classes/resolver/controller/class_BaseControllerResolver.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Resolver\Controller;
 
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A generic controller resolver class
  *
diff --git a/inc/main/classes/stacker/file/class_BaseFileStack.php b/inc/main/classes/stacker/file/class_BaseFileStack.php
index 3d95972c..e51b1b8a 100644
--- a/inc/main/classes/stacker/file/class_BaseFileStack.php
+++ b/inc/main/classes/stacker/file/class_BaseFileStack.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Stack\File;
 
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * A general file-based stack class
  *
diff --git a/inc/main/classes/template/class_BaseTemplateEngine.php b/inc/main/classes/template/class_BaseTemplateEngine.php
index ccb352c9..d507052a 100644
--- a/inc/main/classes/template/class_BaseTemplateEngine.php
+++ b/inc/main/classes/template/class_BaseTemplateEngine.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\TemplateEngine;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Manager\ManageableApplication;
 use CoreFramework\Object\BaseFrameworkSystem;
 
diff --git a/inc/main/classes/template/image/class_ImageTemplateEngine.php b/inc/main/classes/template/image/class_ImageTemplateEngine.php
index ce192aba..cb73f3a8 100644
--- a/inc/main/classes/template/image/class_ImageTemplateEngine.php
+++ b/inc/main/classes/template/image/class_ImageTemplateEngine.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Template\Engine;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Registry\Generic\Registry;
 use CoreFramework\Template\CompileableTemplate;
 
diff --git a/inc/main/classes/template/menu/class_MenuTemplateEngine.php b/inc/main/classes/template/menu/class_MenuTemplateEngine.php
index 5fde22c6..f00cb5b7 100644
--- a/inc/main/classes/template/menu/class_MenuTemplateEngine.php
+++ b/inc/main/classes/template/menu/class_MenuTemplateEngine.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Template\Engine;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Registry\Generic\Registry;
 use CoreFramework\Template\CompileableTemplate;
 
diff --git a/inc/main/classes/user/class_BaseUser.php b/inc/main/classes/user/class_BaseUser.php
index 65af3b2f..e6f767ea 100644
--- a/inc/main/classes/user/class_BaseUser.php
+++ b/inc/main/classes/user/class_BaseUser.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\User;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Object\BaseFrameworkSystem;
 
 /**
diff --git a/inc/main/classes/user/member/class_Member.php b/inc/main/classes/user/member/class_Member.php
index 6be88161..60827cca 100644
--- a/inc/main/classes/user/member/class_Member.php
+++ b/inc/main/classes/user/member/class_Member.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\User\Login;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Registry\Registerable;
 
 /**
diff --git a/inc/main/middleware/compressor/class_CompressorChannel.php b/inc/main/middleware/compressor/class_CompressorChannel.php
index 7cdc9f41..4adb945a 100644
--- a/inc/main/middleware/compressor/class_CompressorChannel.php
+++ b/inc/main/middleware/compressor/class_CompressorChannel.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Channel\Compressor;
 
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * Middleware class for selecting the right compressor channel
  *
diff --git a/inc/main/middleware/debug/class_DebugMiddleware.php b/inc/main/middleware/debug/class_DebugMiddleware.php
index 09f31da0..19ebd395 100644
--- a/inc/main/middleware/debug/class_DebugMiddleware.php
+++ b/inc/main/middleware/debug/class_DebugMiddleware.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Middleware\Debug;
 
+// Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
+
 /**
  * The middlware debug output system. A *real* or concrete output class shall
  * become registered with this middleware because the back-fall class will
diff --git a/inc/main/middleware/io/class_FileIoHandler.php b/inc/main/middleware/io/class_FileIoHandler.php
index e239de5d..26e19f6c 100644
--- a/inc/main/middleware/io/class_FileIoHandler.php
+++ b/inc/main/middleware/io/class_FileIoHandler.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Handler\Filesystem;
 
 // Import framework stuff
+use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Generic\FrameworkInterface;
 
 /**
-- 
2.30.2