diff --git a/flextype/Config.php b/flextype/Config.php
index 75e55ca9..52c3f557 100755
--- a/flextype/Config.php
+++ b/flextype/Config.php
@@ -12,7 +12,7 @@
 
 namespace Flextype;
 
-use Arr;
+use Flextype\Component\Arr\Arr;
 use Symfony\Component\Yaml\Yaml;
 
 class Config
diff --git a/flextype/Events.php b/flextype/Events.php
index a4d0ffa4..a9a4350f 100644
--- a/flextype/Events.php
+++ b/flextype/Events.php
@@ -12,7 +12,7 @@
 
 namespace Flextype;
 
-use Arr;
+use Flextype\Component\Arr\Arr;
 
 class Events
 {
diff --git a/flextype/Flextype.php b/flextype/Flextype.php
index 63e95de6..ad68e4c2 100755
--- a/flextype/Flextype.php
+++ b/flextype/Flextype.php
@@ -13,8 +13,7 @@
 namespace Flextype;
 
 use Symfony\Component\{Filesystem\Filesystem, Finder\Finder};
-use Url;
-use Session;
+use Flextype\Component\{Url\Url, Session\Session};
 
 class Flextype
 {
@@ -103,9 +102,9 @@ class Flextype
         function_exists('mb_internal_encoding') and mb_internal_encoding(Config::get('site.charset'));
 
         // Set Error handler
-        set_error_handler('ErrorHandler::error');
-        register_shutdown_function('ErrorHandler::fatal');
-        set_exception_handler('ErrorHandler::exception');
+        //set_error_handler('ErrorHandler::error');
+        //register_shutdown_function('ErrorHandler::fatal');
+        //set_exception_handler('ErrorHandler::exception');
 
         // Set default timezone
         date_default_timezone_set(Config::get('site.timezone'));
diff --git a/flextype/Pages.php b/flextype/Pages.php
index 1abf3f76..df09bf68 100755
--- a/flextype/Pages.php
+++ b/flextype/Pages.php
@@ -12,9 +12,7 @@
 
 namespace Flextype;
 
-use Arr;
-use Url;
-use Response;
+use Flextype\Component\{Arr\Arr, Url\Url, Response\Response};
 use Symfony\Component\Yaml\Yaml;
 
 class Pages
diff --git a/flextype/Shortcodes.php b/flextype/Shortcodes.php
index a945918e..80bd0747 100644
--- a/flextype/Shortcodes.php
+++ b/flextype/Shortcodes.php
@@ -13,7 +13,7 @@
 namespace Flextype;
 
 use Thunder\Shortcode\ShortcodeFacade;
-use Url;
+use Flextype\Component\Url\Url;
 
 class Shortcodes
 {
diff --git a/flextype/boot/defines.php b/flextype/boot/defines.php
index b76a107c..3c8a1bec 100755
--- a/flextype/boot/defines.php
+++ b/flextype/boot/defines.php
@@ -35,3 +35,6 @@ define('CACHE_PATH', SITE_PATH . '/cache');
 
 // Define the path to the logs directory (without trailing slash).
 define('LOGS_PATH', SITE_PATH . '/logs');
+
+// Define the path to the logs directory (without trailing slash).
+define('ACCOUNTS_PATH', SITE_PATH . '/accounts');