From: Roland Häder <roland@mxchange.org>
Date: Fri, 19 May 2017 00:57:21 +0000 (+0200)
Subject: Next wave:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0e87caea16f72f07cdd6b93186c95247a7747779;p=hub.git

Next wave:
- imported Registry

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/application/hub/classes/commands/console/class_HubConsoleAptProxyCommand.php b/application/hub/classes/commands/console/class_HubConsoleAptProxyCommand.php
index fec457461..dc3bff6bf 100644
--- a/application/hub/classes/commands/console/class_HubConsoleAptProxyCommand.php
+++ b/application/hub/classes/commands/console/class_HubConsoleAptProxyCommand.php
@@ -7,6 +7,7 @@ use CoreFramework\Command\BaseCommand;
 use CoreFramework\Command\Commandable;
 use CoreFramework\Controller\Controller;
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Resolver\Command\CommandResolver;
 use CoreFramework\Response\Responseable;
diff --git a/application/hub/classes/commands/console/class_HubConsoleChatCommand.php b/application/hub/classes/commands/console/class_HubConsoleChatCommand.php
index ecfc236a8..95ceaef8b 100644
--- a/application/hub/classes/commands/console/class_HubConsoleChatCommand.php
+++ b/application/hub/classes/commands/console/class_HubConsoleChatCommand.php
@@ -7,6 +7,7 @@ use CoreFramework\Command\BaseCommand;
 use CoreFramework\Command\Commandable;
 use CoreFramework\Controller\Controller;
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Resolver\Command\CommandResolver;
 use CoreFramework\Response\Responseable;
diff --git a/application/hub/classes/commands/console/class_HubConsoleCrawlerCommand.php b/application/hub/classes/commands/console/class_HubConsoleCrawlerCommand.php
index 713662ef6..0562334dc 100644
--- a/application/hub/classes/commands/console/class_HubConsoleCrawlerCommand.php
+++ b/application/hub/classes/commands/console/class_HubConsoleCrawlerCommand.php
@@ -7,6 +7,7 @@ use CoreFramework\Command\BaseCommand;
 use CoreFramework\Command\Commandable;
 use CoreFramework\Controller\Controller;
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Resolver\Command\CommandResolver;
 use CoreFramework\Response\Responseable;
diff --git a/application/hub/classes/commands/console/class_HubConsoleCruncherCommand.php b/application/hub/classes/commands/console/class_HubConsoleCruncherCommand.php
index 87689b593..a0c8c4315 100644
--- a/application/hub/classes/commands/console/class_HubConsoleCruncherCommand.php
+++ b/application/hub/classes/commands/console/class_HubConsoleCruncherCommand.php
@@ -7,6 +7,7 @@ use CoreFramework\Command\BaseCommand;
 use CoreFramework\Command\Commandable;
 use CoreFramework\Controller\Controller;
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Resolver\Command\CommandResolver;
 use CoreFramework\Response\Responseable;
diff --git a/application/hub/classes/commands/console/class_HubConsoleMainCommand.php b/application/hub/classes/commands/console/class_HubConsoleMainCommand.php
index 2d4ac91a4..4044f51aa 100644
--- a/application/hub/classes/commands/console/class_HubConsoleMainCommand.php
+++ b/application/hub/classes/commands/console/class_HubConsoleMainCommand.php
@@ -10,6 +10,7 @@ use CoreFramework\Command\BaseCommand;
 use CoreFramework\Command\Commandable;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Controller\Controller;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Resolver\Command\CommandResolver;
 use CoreFramework\Response\Responseable;
diff --git a/application/hub/classes/commands/console/class_HubConsoleMinerCommand.php b/application/hub/classes/commands/console/class_HubConsoleMinerCommand.php
index 6e73dc9ea..588f11047 100644
--- a/application/hub/classes/commands/console/class_HubConsoleMinerCommand.php
+++ b/application/hub/classes/commands/console/class_HubConsoleMinerCommand.php
@@ -7,6 +7,7 @@ use CoreFramework\Command\BaseCommand;
 use CoreFramework\Command\Commandable;
 use CoreFramework\Controller\Controller;
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Resolver\Command\CommandResolver;
 use CoreFramework\Response\Responseable;
diff --git a/application/hub/classes/crawler/class_BaseNodeCrawler.php b/application/hub/classes/crawler/class_BaseNodeCrawler.php
index 71be29186..590a222af 100644
--- a/application/hub/classes/crawler/class_BaseNodeCrawler.php
+++ b/application/hub/classes/crawler/class_BaseNodeCrawler.php
@@ -5,6 +5,9 @@ namespace Hub\Crawler;
 // Import hub-specific stuff
 use Hub\Generic\BaseHubSystem;
 
+// Import framework stuff
+use CoreFramework\Registry\Registry;
+
 /**
  * A general NodeCrawler class
  *
diff --git a/application/hub/classes/cruncher/class_BaseHubCruncher.php b/application/hub/classes/cruncher/class_BaseHubCruncher.php
index ea6e6c100..a74852cea 100644
--- a/application/hub/classes/cruncher/class_BaseHubCruncher.php
+++ b/application/hub/classes/cruncher/class_BaseHubCruncher.php
@@ -8,6 +8,7 @@ use Hub\Generic\BaseHubSystem;
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Object\BaseFrameworkSystem;
+use CoreFramework\Registry\Registry;
 
 /**
  * A general hub cruncher class
diff --git a/application/hub/classes/discovery/recipient/socket/class_PackageSocketDiscovery.php b/application/hub/classes/discovery/recipient/socket/class_PackageSocketDiscovery.php
index ae727099c..a310c9c78 100644
--- a/application/hub/classes/discovery/recipient/socket/class_PackageSocketDiscovery.php
+++ b/application/hub/classes/discovery/recipient/socket/class_PackageSocketDiscovery.php
@@ -6,6 +6,9 @@ namespace Hub\Network\Discovery\Socket;
 use Hub\Factory\Node\NodeObjectFactory;
 use Hub\Generic\BaseHubSystem;
 
+// Import framework stuff
+use CoreFramework\Registry\Registry;
+
 /**
  * A socket discovery class
  *
diff --git a/application/hub/classes/factories/chain/class_PackageFilterChainFactory.php b/application/hub/classes/factories/chain/class_PackageFilterChainFactory.php
index 755787506..72f7aa7fb 100644
--- a/application/hub/classes/factories/chain/class_PackageFilterChainFactory.php
+++ b/application/hub/classes/factories/chain/class_PackageFilterChainFactory.php
@@ -4,6 +4,7 @@ namespace Hub\Factory\FilterChain\Package;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registry;
 
 /**
  * A factory class for network packages
diff --git a/application/hub/classes/factories/chunks/class_ChunkHandlerFactory.php b/application/hub/classes/factories/chunks/class_ChunkHandlerFactory.php
index d9242cf44..b24ca6dcb 100644
--- a/application/hub/classes/factories/chunks/class_ChunkHandlerFactory.php
+++ b/application/hub/classes/factories/chunks/class_ChunkHandlerFactory.php
@@ -4,6 +4,7 @@ namespace Hub\Factory\Handler\Chunk;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registry;
 
 /**
  * A factory class for chunk handler
diff --git a/application/hub/classes/factories/class_ b/application/hub/classes/factories/class_
index 2c3b4db53..0dbb3ddf8 100644
--- a/application/hub/classes/factories/class_
+++ b/application/hub/classes/factories/class_
@@ -4,6 +4,7 @@ namespace Hub\Factory\;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registry;
 
 /**
  * A factory class for !!!
diff --git a/application/hub/classes/factories/communicator/class_CommunicatorFactory.php b/application/hub/classes/factories/communicator/class_CommunicatorFactory.php
index 47cbfcde0..d718fa67d 100644
--- a/application/hub/classes/factories/communicator/class_CommunicatorFactory.php
+++ b/application/hub/classes/factories/communicator/class_CommunicatorFactory.php
@@ -4,6 +4,7 @@ namespace Hub\Factory\Communicator;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registry;
 
 /**
  * A factory class for communicator
diff --git a/application/hub/classes/factories/decoder/class_DecoderFactory.php b/application/hub/classes/factories/decoder/class_DecoderFactory.php
index 1fb21442a..db3809879 100644
--- a/application/hub/classes/factories/decoder/class_DecoderFactory.php
+++ b/application/hub/classes/factories/decoder/class_DecoderFactory.php
@@ -4,6 +4,7 @@ namespace Hub\Factory\Decoder;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registry;
 
 /**
  * A factory class for Decodeable objects
diff --git a/application/hub/classes/factories/dht/class_DhtObjectFactory.php b/application/hub/classes/factories/dht/class_DhtObjectFactory.php
index 9bd4e96bc..d30d7b8ea 100644
--- a/application/hub/classes/factories/dht/class_DhtObjectFactory.php
+++ b/application/hub/classes/factories/dht/class_DhtObjectFactory.php
@@ -4,6 +4,7 @@ namespace Hub\Factory\Dht;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registry;
 
 /**
  * A factory class for DHT objects
diff --git a/application/hub/classes/factories/discovery/class_PackageDiscoveryFactory.php b/application/hub/classes/factories/discovery/class_PackageDiscoveryFactory.php
index 7b595eeaf..9d9156848 100644
--- a/application/hub/classes/factories/discovery/class_PackageDiscoveryFactory.php
+++ b/application/hub/classes/factories/discovery/class_PackageDiscoveryFactory.php
@@ -4,6 +4,7 @@ namespace Hub\Factory\Discovery\Package;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registry;
 
 /**
  * A factory class for package discovery
diff --git a/application/hub/classes/factories/discovery/class_SocketDiscoveryFactory.php b/application/hub/classes/factories/discovery/class_SocketDiscoveryFactory.php
index a1a634f8a..46ce751c4 100644
--- a/application/hub/classes/factories/discovery/class_SocketDiscoveryFactory.php
+++ b/application/hub/classes/factories/discovery/class_SocketDiscoveryFactory.php
@@ -4,6 +4,7 @@ namespace Hub\Factory\Discovery\Socket;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registry;
 
 /**
  * A factory class for socket discovery
diff --git a/application/hub/classes/factories/handler/class_MessageTypeHandlerFactory.php b/application/hub/classes/factories/handler/class_MessageTypeHandlerFactory.php
index 157b877de..d89945bb2 100644
--- a/application/hub/classes/factories/handler/class_MessageTypeHandlerFactory.php
+++ b/application/hub/classes/factories/handler/class_MessageTypeHandlerFactory.php
@@ -4,6 +4,7 @@ namespace Hub\Factory\Handler\Message;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registry;
 
 /**
  * A factory class for message type handlers
diff --git a/application/hub/classes/factories/handler/class_ProtocolHandlerFactory.php b/application/hub/classes/factories/handler/class_ProtocolHandlerFactory.php
index c10bb85b1..e631b0a14 100644
--- a/application/hub/classes/factories/handler/class_ProtocolHandlerFactory.php
+++ b/application/hub/classes/factories/handler/class_ProtocolHandlerFactory.php
@@ -4,6 +4,8 @@ namespace Hub\Factory\Handler\Protocol;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registry;
+
 /**
  * A factory class for protocol handlers
  *
diff --git a/application/hub/classes/factories/info/class_ConnectionInfoFactory.php b/application/hub/classes/factories/info/class_ConnectionInfoFactory.php
index 3871f6dc4..14454ecc5 100644
--- a/application/hub/classes/factories/info/class_ConnectionInfoFactory.php
+++ b/application/hub/classes/factories/info/class_ConnectionInfoFactory.php
@@ -4,6 +4,7 @@ namespace Hub\Factory\Connection;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registry;
 
 /**
  * A factory class for ShareableInfo
diff --git a/application/hub/classes/factories/lists/class_RecipientListFactory.php b/application/hub/classes/factories/lists/class_RecipientListFactory.php
index 11dae1ff2..56350ef40 100644
--- a/application/hub/classes/factories/lists/class_RecipientListFactory.php
+++ b/application/hub/classes/factories/lists/class_RecipientListFactory.php
@@ -4,6 +4,7 @@ namespace Hub\Factory\List\Recipient;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registry;
 
 /**
  * A factory class for recipient lists
diff --git a/application/hub/classes/factories/node/class_NodeObjectFactory.php b/application/hub/classes/factories/node/class_NodeObjectFactory.php
index 146896c0c..dd15ba15f 100644
--- a/application/hub/classes/factories/node/class_NodeObjectFactory.php
+++ b/application/hub/classes/factories/node/class_NodeObjectFactory.php
@@ -4,6 +4,7 @@ namespace Hub\Factory\Node;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/factories/package/assembler/class_PackageAssemblerFactory.php b/application/hub/classes/factories/package/assembler/class_PackageAssemblerFactory.php
index e7306ad10..ef14597f5 100644
--- a/application/hub/classes/factories/package/assembler/class_PackageAssemblerFactory.php
+++ b/application/hub/classes/factories/package/assembler/class_PackageAssemblerFactory.php
@@ -4,6 +4,7 @@ namespace Hub\Factory\Assembler\Package;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registry;
 
 /**
  * A factory class for package assembler
diff --git a/application/hub/classes/factories/package/class_NetworkPackageFactory.php b/application/hub/classes/factories/package/class_NetworkPackageFactory.php
index ac2f793e3..0268c1037 100644
--- a/application/hub/classes/factories/package/class_NetworkPackageFactory.php
+++ b/application/hub/classes/factories/package/class_NetworkPackageFactory.php
@@ -4,6 +4,7 @@ namespace Hub\Factory\Network;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registry;
 
 /**
  * A factory class for network packages
diff --git a/application/hub/classes/factories/package/fragmenter/class_FragmenterFactory.php b/application/hub/classes/factories/package/fragmenter/class_FragmenterFactory.php
index 7d8d26635..d243422af 100644
--- a/application/hub/classes/factories/package/fragmenter/class_FragmenterFactory.php
+++ b/application/hub/classes/factories/package/fragmenter/class_FragmenterFactory.php
@@ -4,6 +4,7 @@ namespace Hub\Factory\Fragmenter;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registry;
 
 /**
  * A factory class for fragmenter
diff --git a/application/hub/classes/factories/producer/class_ProducerFactory.php b/application/hub/classes/factories/producer/class_ProducerFactory.php
index 7b3720086..c711d2e12 100644
--- a/application/hub/classes/factories/producer/class_ProducerFactory.php
+++ b/application/hub/classes/factories/producer/class_ProducerFactory.php
@@ -4,6 +4,7 @@ namespace Hub\Factory\Producer;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registry;
 
 /**
  * A factory class for producer
diff --git a/application/hub/classes/factories/registry/class_ObjectTypeRegistryFactory.php b/application/hub/classes/factories/registry/class_ObjectTypeRegistryFactory.php
index 72b3e38ea..3854329d2 100644
--- a/application/hub/classes/factories/registry/class_ObjectTypeRegistryFactory.php
+++ b/application/hub/classes/factories/registry/class_ObjectTypeRegistryFactory.php
@@ -4,6 +4,7 @@ namespace Hub\Factory\Registry\Object;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registry;
 
 /**
  * A factory class for network packages
diff --git a/application/hub/classes/factories/resolver/class_ProtocolResolverFactory.php b/application/hub/classes/factories/resolver/class_ProtocolResolverFactory.php
index ca5ccf636..9ff8107ae 100644
--- a/application/hub/classes/factories/resolver/class_ProtocolResolverFactory.php
+++ b/application/hub/classes/factories/resolver/class_ProtocolResolverFactory.php
@@ -5,6 +5,7 @@ namespace Hub\Factory\Resolver;
 // Import framework stuff
 use CoreFramework\Configuration\FrameworkConfiguration;
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registry;
 
 /**
  * A factory class for ProtocolResolver
diff --git a/application/hub/classes/factories/scanner/class_ScannerObjectFactory.php b/application/hub/classes/factories/scanner/class_ScannerObjectFactory.php
index 87d1c614d..c91c0ecd2 100644
--- a/application/hub/classes/factories/scanner/class_ScannerObjectFactory.php
+++ b/application/hub/classes/factories/scanner/class_ScannerObjectFactory.php
@@ -4,6 +4,7 @@ namespace Hub\Factory\Scanner;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registry;
 
 /**
  * A factory class for scanners
diff --git a/application/hub/classes/factories/socket/class_SocketFactory.php b/application/hub/classes/factories/socket/class_SocketFactory.php
index fcf4f499d..e070f0ef3 100644
--- a/application/hub/classes/factories/socket/class_SocketFactory.php
+++ b/application/hub/classes/factories/socket/class_SocketFactory.php
@@ -3,8 +3,9 @@
 namespace Hub\Factory\Socket;
 
 // Import framework stuff
-use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Configuration\FrameworkConfiguration;
+use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registry;
 
 /**
  * A socket factory class
diff --git a/application/hub/classes/factories/source/units/class_UnitSourceFactory.php b/application/hub/classes/factories/source/units/class_UnitSourceFactory.php
index 837dc5224..ea46c2943 100644
--- a/application/hub/classes/factories/source/units/class_UnitSourceFactory.php
+++ b/application/hub/classes/factories/source/units/class_UnitSourceFactory.php
@@ -4,6 +4,7 @@ namespace Hub\Source\Unit;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registry;
 
 /**
  * A factory class for unit sources
diff --git a/application/hub/classes/factories/source/url/class_UrlSourceObjectFactory.php b/application/hub/classes/factories/source/url/class_UrlSourceObjectFactory.php
index fed603d29..22d8876f7 100644
--- a/application/hub/classes/factories/source/url/class_UrlSourceObjectFactory.php
+++ b/application/hub/classes/factories/source/url/class_UrlSourceObjectFactory.php
@@ -4,6 +4,7 @@ namespace Hub\Source\Url;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registry;
 
 /**
  * A factory class for URL sources
diff --git a/application/hub/classes/factories/states/crawler/class_CrawlerStateFactory.php b/application/hub/classes/factories/states/crawler/class_CrawlerStateFactory.php
index 2cee0ad99..d1ca0013c 100644
--- a/application/hub/classes/factories/states/crawler/class_CrawlerStateFactory.php
+++ b/application/hub/classes/factories/states/crawler/class_CrawlerStateFactory.php
@@ -4,6 +4,7 @@ namespace Hub\Factory\State\Crawler;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registry;
 
 /**
  * A factory class for crawler states
diff --git a/application/hub/classes/factories/states/cruncher/class_CruncherStateFactory.php b/application/hub/classes/factories/states/cruncher/class_CruncherStateFactory.php
index 399ead21b..d89bb97c5 100644
--- a/application/hub/classes/factories/states/cruncher/class_CruncherStateFactory.php
+++ b/application/hub/classes/factories/states/cruncher/class_CruncherStateFactory.php
@@ -4,6 +4,7 @@ namespace Hub\Factory\State\Cruncher;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registry;
 
 /**
  * A factory class for cruncher states
diff --git a/application/hub/classes/factories/states/miner/class_MinerStateFactory.php b/application/hub/classes/factories/states/miner/class_MinerStateFactory.php
index 0c3b620e6..eb2bf1b1e 100644
--- a/application/hub/classes/factories/states/miner/class_MinerStateFactory.php
+++ b/application/hub/classes/factories/states/miner/class_MinerStateFactory.php
@@ -4,6 +4,7 @@ namespace Hub\Factory\State\Miner;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registry;
 
 /**
  * A factory class for miner states
diff --git a/application/hub/classes/factories/tags/class_PackageTagsFactory.php b/application/hub/classes/factories/tags/class_PackageTagsFactory.php
index f7ad8436a..6a3e65dc4 100644
--- a/application/hub/classes/factories/tags/class_PackageTagsFactory.php
+++ b/application/hub/classes/factories/tags/class_PackageTagsFactory.php
@@ -4,6 +4,7 @@ namespace Hub\Factory\Tag\Package;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registry;
 
 /**
  * A factory class for network packages
diff --git a/application/hub/classes/filter/activation/node/class_NodeActivationAnnouncementFilter.php b/application/hub/classes/filter/activation/node/class_NodeActivationAnnouncementFilter.php
index 2a1f273e2..783a36a52 100644
--- a/application/hub/classes/filter/activation/node/class_NodeActivationAnnouncementFilter.php
+++ b/application/hub/classes/filter/activation/node/class_NodeActivationAnnouncementFilter.php
@@ -8,6 +8,7 @@ use Hub\Filter\Node\BaseNodeFilter;
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Filter\Filterable;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/apt-proxy/class_AptProxyInitializationFilter.php b/application/hub/classes/filter/apt-proxy/class_AptProxyInitializationFilter.php
index ae9ffc857..f6607bfc3 100644
--- a/application/hub/classes/filter/apt-proxy/class_AptProxyInitializationFilter.php
+++ b/application/hub/classes/filter/apt-proxy/class_AptProxyInitializationFilter.php
@@ -5,6 +5,7 @@ namespace Hub\AptProxy\Filter\Initialization;
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Filter\Filterable;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/apt-proxy/class_AptProxyWelcomeTeaserFilter.php b/application/hub/classes/filter/apt-proxy/class_AptProxyWelcomeTeaserFilter.php
index 63026a8e5..262f87b33 100644
--- a/application/hub/classes/filter/apt-proxy/class_AptProxyWelcomeTeaserFilter.php
+++ b/application/hub/classes/filter/apt-proxy/class_AptProxyWelcomeTeaserFilter.php
@@ -4,6 +4,7 @@ namespace Hub\AptProxy\Filter\WelcomeTeaser;
 
 // Import framework stuff
 use CoreFramework\Filter\Filterable;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/bootstrap/apt-proxy/class_AptProxyBootstrap b/application/hub/classes/filter/bootstrap/apt-proxy/class_AptProxyBootstrap
index 47f385ade..817205e02 100644
--- a/application/hub/classes/filter/bootstrap/apt-proxy/class_AptProxyBootstrap
+++ b/application/hub/classes/filter/bootstrap/apt-proxy/class_AptProxyBootstrap
@@ -4,6 +4,7 @@ namespace Hub\Filter\Bootstrap\AptProxy\;
 
 // Import framework stuff
 use CoreFramework\Filter\Filterable;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/bootstrap/apt-proxy/class_AptProxyBootstrapExtraBootstrappingFilter.php b/application/hub/classes/filter/bootstrap/apt-proxy/class_AptProxyBootstrapExtraBootstrappingFilter.php
index 9579ecb24..21f72634f 100644
--- a/application/hub/classes/filter/bootstrap/apt-proxy/class_AptProxyBootstrapExtraBootstrappingFilter.php
+++ b/application/hub/classes/filter/bootstrap/apt-proxy/class_AptProxyBootstrapExtraBootstrappingFilter.php
@@ -4,6 +4,7 @@ namespace Hub\Filter\Bootstrap\AptProxy\Extra;
 
 // Import framework stuff
 use CoreFramework\Filter\Filterable;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/bootstrap/apt-proxy/class_AptProxyBootstrapGenericActivationFilter.php b/application/hub/classes/filter/bootstrap/apt-proxy/class_AptProxyBootstrapGenericActivationFilter.php
index 399a709eb..d9772ed6f 100644
--- a/application/hub/classes/filter/bootstrap/apt-proxy/class_AptProxyBootstrapGenericActivationFilter.php
+++ b/application/hub/classes/filter/bootstrap/apt-proxy/class_AptProxyBootstrapGenericActivationFilter.php
@@ -4,6 +4,7 @@ namespace Hub\Filter\Bootstrap\AptProxy\Activation;
 
 // Import framework stuff
 use CoreFramework\Filter\Filterable;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/bootstrap/chat/class_ChatBootstrap b/application/hub/classes/filter/bootstrap/chat/class_ChatBootstrap
index 1852fffe5..90b06bb5d 100644
--- a/application/hub/classes/filter/bootstrap/chat/class_ChatBootstrap
+++ b/application/hub/classes/filter/bootstrap/chat/class_ChatBootstrap
@@ -4,6 +4,7 @@ namespace Hub\Filter\Bootstrap\Chat\;
 
 // Import framework stuff
 use CoreFramework\Filter\Filterable;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/bootstrap/chat/class_ChatBootstrapExtraBootstrappingFilter.php b/application/hub/classes/filter/bootstrap/chat/class_ChatBootstrapExtraBootstrappingFilter.php
index 7c830c659..c230f6af0 100644
--- a/application/hub/classes/filter/bootstrap/chat/class_ChatBootstrapExtraBootstrappingFilter.php
+++ b/application/hub/classes/filter/bootstrap/chat/class_ChatBootstrapExtraBootstrappingFilter.php
@@ -4,6 +4,7 @@ namespace Hub\Filter\Bootstrap\Chat\Extra;
 
 // Import framework stuff
 use CoreFramework\Filter\Filterable;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/bootstrap/chat/class_ChatBootstrapGenericActivationFilter.php b/application/hub/classes/filter/bootstrap/chat/class_ChatBootstrapGenericActivationFilter.php
index 5f10fbf2e..895aa0ef6 100644
--- a/application/hub/classes/filter/bootstrap/chat/class_ChatBootstrapGenericActivationFilter.php
+++ b/application/hub/classes/filter/bootstrap/chat/class_ChatBootstrapGenericActivationFilter.php
@@ -4,6 +4,7 @@ namespace Hub\Filter\Bootstrap\Chat\Activation;
 
 // Import framework stuff
 use CoreFramework\Filter\Filterable;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/bootstrap/crawler/class_CrawlerBootstrap b/application/hub/classes/filter/bootstrap/crawler/class_CrawlerBootstrap
index 5128e776a..a8b3cb901 100644
--- a/application/hub/classes/filter/bootstrap/crawler/class_CrawlerBootstrap
+++ b/application/hub/classes/filter/bootstrap/crawler/class_CrawlerBootstrap
@@ -4,6 +4,7 @@ namespace Hub\Filter\Bootstrap\Crawler\;
 
 // Import framework stuff
 use CoreFramework\Filter\Filterable;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/bootstrap/crawler/class_CrawlerBootstrapExtraBootstrappingFilter.php b/application/hub/classes/filter/bootstrap/crawler/class_CrawlerBootstrapExtraBootstrappingFilter.php
index 12e7ed593..41cb1bf59 100644
--- a/application/hub/classes/filter/bootstrap/crawler/class_CrawlerBootstrapExtraBootstrappingFilter.php
+++ b/application/hub/classes/filter/bootstrap/crawler/class_CrawlerBootstrapExtraBootstrappingFilter.php
@@ -4,6 +4,7 @@ namespace Hub\Filter\Bootstrap\Crawler\Extra;
 
 // Import framework stuff
 use CoreFramework\Filter\Filterable;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/bootstrap/crawler/class_CrawlerBootstrapGenericActivationFilter.php b/application/hub/classes/filter/bootstrap/crawler/class_CrawlerBootstrapGenericActivationFilter.php
index e4a840984..81a5cb1c3 100644
--- a/application/hub/classes/filter/bootstrap/crawler/class_CrawlerBootstrapGenericActivationFilter.php
+++ b/application/hub/classes/filter/bootstrap/crawler/class_CrawlerBootstrapGenericActivationFilter.php
@@ -4,6 +4,7 @@ namespace Hub\Filter\Bootstrap\Crawler\Activation;
 
 // Import framework stuff
 use CoreFramework\Filter\Filterable;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/bootstrap/cruncher/class_CruncherBootstrap b/application/hub/classes/filter/bootstrap/cruncher/class_CruncherBootstrap
index 64c5ca8df..461ca026f 100644
--- a/application/hub/classes/filter/bootstrap/cruncher/class_CruncherBootstrap
+++ b/application/hub/classes/filter/bootstrap/cruncher/class_CruncherBootstrap
@@ -4,6 +4,7 @@ namespace Hub\Filter\Bootstrap\Cruncher\;
 
 // Import framework stuff
 use CoreFramework\Filter\Filterable;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/bootstrap/cruncher/class_CruncherBootstrapBufferQueueInitializerFilter.php b/application/hub/classes/filter/bootstrap/cruncher/class_CruncherBootstrapBufferQueueInitializerFilter.php
index b9d06ada3..78d7f78d9 100644
--- a/application/hub/classes/filter/bootstrap/cruncher/class_CruncherBootstrapBufferQueueInitializerFilter.php
+++ b/application/hub/classes/filter/bootstrap/cruncher/class_CruncherBootstrapBufferQueueInitializerFilter.php
@@ -4,6 +4,7 @@ namespace Hub\Filter\Bootstrap\Cruncher\Queue;
 
 // Import framework stuff
 use CoreFramework\Filter\Filterable;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/bootstrap/cruncher/class_CruncherBootstrapExtraBootstrappingFilter.php b/application/hub/classes/filter/bootstrap/cruncher/class_CruncherBootstrapExtraBootstrappingFilter.php
index 5c77f1b47..8bd9c9470 100644
--- a/application/hub/classes/filter/bootstrap/cruncher/class_CruncherBootstrapExtraBootstrappingFilter.php
+++ b/application/hub/classes/filter/bootstrap/cruncher/class_CruncherBootstrapExtraBootstrappingFilter.php
@@ -4,6 +4,7 @@ namespace Hub\Filter\Bootstrap\Cruncher\Extra;
 
 // Import framework stuff
 use CoreFramework\Filter\Filterable;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/bootstrap/cruncher/class_CruncherBootstrapGenericActivationFilter.php b/application/hub/classes/filter/bootstrap/cruncher/class_CruncherBootstrapGenericActivationFilter.php
index d3bb77f69..018e99c47 100644
--- a/application/hub/classes/filter/bootstrap/cruncher/class_CruncherBootstrapGenericActivationFilter.php
+++ b/application/hub/classes/filter/bootstrap/cruncher/class_CruncherBootstrapGenericActivationFilter.php
@@ -4,6 +4,7 @@ namespace Hub\Filter\Bootstrap\Cruncher\Activation;
 
 // Import framework stuff
 use CoreFramework\Filter\Filterable;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/bootstrap/miner/class_MinerBootstrap b/application/hub/classes/filter/bootstrap/miner/class_MinerBootstrap
index 47e227aa0..d06045ccc 100644
--- a/application/hub/classes/filter/bootstrap/miner/class_MinerBootstrap
+++ b/application/hub/classes/filter/bootstrap/miner/class_MinerBootstrap
@@ -4,6 +4,7 @@ namespace Hub\Filter\Bootstrap\Miner\;
 
 // Import framework stuff
 use CoreFramework\Filter\Filterable;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/bootstrap/miner/class_MinerBootstrapBufferQueueInitializerFilter.php b/application/hub/classes/filter/bootstrap/miner/class_MinerBootstrapBufferQueueInitializerFilter.php
index 5bc21e93a..424ba22cc 100644
--- a/application/hub/classes/filter/bootstrap/miner/class_MinerBootstrapBufferQueueInitializerFilter.php
+++ b/application/hub/classes/filter/bootstrap/miner/class_MinerBootstrapBufferQueueInitializerFilter.php
@@ -4,6 +4,7 @@ namespace Hub\Filter\Bootstrap\Miner\Queue;
 
 // Import framework stuff
 use CoreFramework\Filter\Filterable;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/bootstrap/miner/class_MinerBootstrapExtraBootstrappingFilter.php b/application/hub/classes/filter/bootstrap/miner/class_MinerBootstrapExtraBootstrappingFilter.php
index 386bdc03c..50b2b6aa8 100644
--- a/application/hub/classes/filter/bootstrap/miner/class_MinerBootstrapExtraBootstrappingFilter.php
+++ b/application/hub/classes/filter/bootstrap/miner/class_MinerBootstrapExtraBootstrappingFilter.php
@@ -4,6 +4,7 @@ namespace Hub\Filter\Bootstrap\Miner\Extra;
 
 // Import framework stuff
 use CoreFramework\Filter\Filterable;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/bootstrap/miner/class_MinerBootstrapGenericActivationFilter.php b/application/hub/classes/filter/bootstrap/miner/class_MinerBootstrapGenericActivationFilter.php
index 2a8a870a0..91c5890cd 100644
--- a/application/hub/classes/filter/bootstrap/miner/class_MinerBootstrapGenericActivationFilter.php
+++ b/application/hub/classes/filter/bootstrap/miner/class_MinerBootstrapGenericActivationFilter.php
@@ -4,6 +4,7 @@ namespace Hub\Filter\Bootstrap\Miner\Activation;
 
 // Import framework stuff
 use CoreFramework\Filter\Filterable;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/chat/class_ChatInitializationFilter.php b/application/hub/classes/filter/chat/class_ChatInitializationFilter.php
index f46ecbe2c..1c70c63b3 100644
--- a/application/hub/classes/filter/chat/class_ChatInitializationFilter.php
+++ b/application/hub/classes/filter/chat/class_ChatInitializationFilter.php
@@ -5,6 +5,7 @@ namespace Hub\Chat\Filter\Initialization;
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Filter\Filterable;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/chat/class_ChatWelcomeTeaserFilter.php b/application/hub/classes/filter/chat/class_ChatWelcomeTeaserFilter.php
index b26722877..2250b18b8 100644
--- a/application/hub/classes/filter/chat/class_ChatWelcomeTeaserFilter.php
+++ b/application/hub/classes/filter/chat/class_ChatWelcomeTeaserFilter.php
@@ -4,6 +4,7 @@ namespace Hub\Chat\Filter\WelcomeTeaser;
 
 // Import framework stuff
 use CoreFramework\Filter\Filterable;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/crawler/class_CrawlerInitializationFilter.php b/application/hub/classes/filter/crawler/class_CrawlerInitializationFilter.php
index 5d0067007..06ed8223d 100644
--- a/application/hub/classes/filter/crawler/class_CrawlerInitializationFilter.php
+++ b/application/hub/classes/filter/crawler/class_CrawlerInitializationFilter.php
@@ -5,6 +5,7 @@ namespace Hub\Crawler\Filter\Initialization;
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Filter\Filterable;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/crawler/class_CrawlerWelcomeTeaserFilter.php b/application/hub/classes/filter/crawler/class_CrawlerWelcomeTeaserFilter.php
index 24e0e7bc6..ef6de3b1d 100644
--- a/application/hub/classes/filter/crawler/class_CrawlerWelcomeTeaserFilter.php
+++ b/application/hub/classes/filter/crawler/class_CrawlerWelcomeTeaserFilter.php
@@ -4,6 +4,7 @@ namespace Hub\Crawler\Filter\WelcomeTeaser;
 
 // Import framework stuff
 use CoreFramework\Filter\Filterable;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/cruncher/class_CruncherInitializationFilter.php b/application/hub/classes/filter/cruncher/class_CruncherInitializationFilter.php
index a613bc46a..075515046 100644
--- a/application/hub/classes/filter/cruncher/class_CruncherInitializationFilter.php
+++ b/application/hub/classes/filter/cruncher/class_CruncherInitializationFilter.php
@@ -5,6 +5,7 @@ namespace Hub\Cruncher\Filter\Initialization;
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Filter\Filterable;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/cruncher/class_CruncherWelcomeTeaserFilter.php b/application/hub/classes/filter/cruncher/class_CruncherWelcomeTeaserFilter.php
index cda7b0b3b..3db78b402 100644
--- a/application/hub/classes/filter/cruncher/class_CruncherWelcomeTeaserFilter.php
+++ b/application/hub/classes/filter/cruncher/class_CruncherWelcomeTeaserFilter.php
@@ -4,6 +4,7 @@ namespace Hub\Cruncher\Filter\WelcomeTeaser;
 
 // Import framework stuff
 use CoreFramework\Filter\Filterable;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/miner/class_MinerInitializationFilter.php b/application/hub/classes/filter/miner/class_MinerInitializationFilter.php
index 9a37c0b6a..7595fabcd 100644
--- a/application/hub/classes/filter/miner/class_MinerInitializationFilter.php
+++ b/application/hub/classes/filter/miner/class_MinerInitializationFilter.php
@@ -5,6 +5,7 @@ namespace Hub\Miner\Filter\Initialization;
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Filter\Filterable;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/miner/class_MinerWelcomeTeaserFilter.php b/application/hub/classes/filter/miner/class_MinerWelcomeTeaserFilter.php
index 2be6fdf3e..689df7737 100644
--- a/application/hub/classes/filter/miner/class_MinerWelcomeTeaserFilter.php
+++ b/application/hub/classes/filter/miner/class_MinerWelcomeTeaserFilter.php
@@ -4,6 +4,7 @@ namespace Hub\Miner\Filter\WelcomeTeaser;
 
 // Import framework stuff
 use CoreFramework\Filter\Filterable;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/shutdown/apt-proxy/class_AptProxyShutdownFilter.php b/application/hub/classes/filter/shutdown/apt-proxy/class_AptProxyShutdownFilter.php
index 3af750431..c21995977 100644
--- a/application/hub/classes/filter/shutdown/apt-proxy/class_AptProxyShutdownFilter.php
+++ b/application/hub/classes/filter/shutdown/apt-proxy/class_AptProxyShutdownFilter.php
@@ -4,6 +4,7 @@ namespace Hub\Filter\Shutdown\AptProxy;
 
 // Import framework stuff
 use CoreFramework\Filter\Filterable;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/shutdown/chat/class_ChatShutdownFilter.php b/application/hub/classes/filter/shutdown/chat/class_ChatShutdownFilter.php
index 79ce52086..c86a7f5fc 100644
--- a/application/hub/classes/filter/shutdown/chat/class_ChatShutdownFilter.php
+++ b/application/hub/classes/filter/shutdown/chat/class_ChatShutdownFilter.php
@@ -4,6 +4,7 @@ namespace Hub\Filter\Shutdown\Chat;
 
 // Import framework stuff
 use CoreFramework\Filter\Filterable;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/shutdown/crawler/class_CrawlerShutdownFilter.php b/application/hub/classes/filter/shutdown/crawler/class_CrawlerShutdownFilter.php
index ae10a2393..93e3e5cf9 100644
--- a/application/hub/classes/filter/shutdown/crawler/class_CrawlerShutdownFilter.php
+++ b/application/hub/classes/filter/shutdown/crawler/class_CrawlerShutdownFilter.php
@@ -4,6 +4,7 @@ namespace Hub\Filter\Shutdown\Crawler;
 
 // Import framework stuff
 use CoreFramework\Filter\Filterable;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/shutdown/cruncher/class_CruncherShutdownFilter.php b/application/hub/classes/filter/shutdown/cruncher/class_CruncherShutdownFilter.php
index 8a306c5e6..4ab6c409d 100644
--- a/application/hub/classes/filter/shutdown/cruncher/class_CruncherShutdownFilter.php
+++ b/application/hub/classes/filter/shutdown/cruncher/class_CruncherShutdownFilter.php
@@ -4,6 +4,7 @@ namespace Hub\Filter\Shutdown\Cruncher;
 
 // Import framework stuff
 use CoreFramework\Filter\Filterable;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/shutdown/miner/class_MinerShutdownFilter.php b/application/hub/classes/filter/shutdown/miner/class_MinerShutdownFilter.php
index bcc233ad8..7bcbe0361 100644
--- a/application/hub/classes/filter/shutdown/miner/class_MinerShutdownFilter.php
+++ b/application/hub/classes/filter/shutdown/miner/class_MinerShutdownFilter.php
@@ -4,6 +4,7 @@ namespace Hub\Filter\Shutdown\Miner;
 
 // Import framework stuff
 use CoreFramework\Filter\Filterable;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/shutdown/node/class_NodeShutdownTaskHandlerFilter.php b/application/hub/classes/filter/shutdown/node/class_NodeShutdownTaskHandlerFilter.php
index 3fe497de8..087664187 100644
--- a/application/hub/classes/filter/shutdown/node/class_NodeShutdownTaskHandlerFilter.php
+++ b/application/hub/classes/filter/shutdown/node/class_NodeShutdownTaskHandlerFilter.php
@@ -7,6 +7,7 @@ use Hub\Filter\Node\BaseNodeFilter;
 
 // Import framework stuff
 use CoreFramework\Filter\Filterable;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/task/apt-proxy/class_AptProxyTaskHandlerInitializerFilter.php b/application/hub/classes/filter/task/apt-proxy/class_AptProxyTaskHandlerInitializerFilter.php
index 3b05e4d79..7bd356f28 100644
--- a/application/hub/classes/filter/task/apt-proxy/class_AptProxyTaskHandlerInitializerFilter.php
+++ b/application/hub/classes/filter/task/apt-proxy/class_AptProxyTaskHandlerInitializerFilter.php
@@ -5,6 +5,7 @@ namespace Hub\Filter\Initializer\AptProxy\Handler\Task;
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Filter\Filterable;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/task/chat/class_ChatTaskHandlerInitializerFilter.php b/application/hub/classes/filter/task/chat/class_ChatTaskHandlerInitializerFilter.php
index 9b3b1335b..13b1bf2e8 100644
--- a/application/hub/classes/filter/task/chat/class_ChatTaskHandlerInitializerFilter.php
+++ b/application/hub/classes/filter/task/chat/class_ChatTaskHandlerInitializerFilter.php
@@ -5,6 +5,7 @@ namespace Hub\Filter\Initializer\Chat\Handler\Task;
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Filter\Filterable;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/task/crawler/class_CrawlerTaskHandlerInitializerFilter.php b/application/hub/classes/filter/task/crawler/class_CrawlerTaskHandlerInitializerFilter.php
index 564f01b8c..05ba31b65 100644
--- a/application/hub/classes/filter/task/crawler/class_CrawlerTaskHandlerInitializerFilter.php
+++ b/application/hub/classes/filter/task/crawler/class_CrawlerTaskHandlerInitializerFilter.php
@@ -5,6 +5,7 @@ namespace Hub\Filter\Initializer\Crawler\Handler\Task;
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Filter\Filterable;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/task/cruncher/class_CruncherTaskHandlerInitializerFilter.php b/application/hub/classes/filter/task/cruncher/class_CruncherTaskHandlerInitializerFilter.php
index 3e13bcd3b..de9ea8b81 100644
--- a/application/hub/classes/filter/task/cruncher/class_CruncherTaskHandlerInitializerFilter.php
+++ b/application/hub/classes/filter/task/cruncher/class_CruncherTaskHandlerInitializerFilter.php
@@ -5,6 +5,7 @@ namespace Hub\Filter\Initializer\Cruncher\Handler\Task;
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Filter\Filterable;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/task/miner/class_MinerTaskHandlerInitializerFilter.php b/application/hub/classes/filter/task/miner/class_MinerTaskHandlerInitializerFilter.php
index 71c0140e7..1d3e107c7 100644
--- a/application/hub/classes/filter/task/miner/class_MinerTaskHandlerInitializerFilter.php
+++ b/application/hub/classes/filter/task/miner/class_MinerTaskHandlerInitializerFilter.php
@@ -5,6 +5,7 @@ namespace Hub\Filter\Initializer\Miner\Handler\Task;
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Filter\Filterable;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/filter/task/node/class_NodeTaskHandlerInitializerFilter.php b/application/hub/classes/filter/task/node/class_NodeTaskHandlerInitializerFilter.php
index a6f6846b5..5d60f98bb 100644
--- a/application/hub/classes/filter/task/node/class_NodeTaskHandlerInitializerFilter.php
+++ b/application/hub/classes/filter/task/node/class_NodeTaskHandlerInitializerFilter.php
@@ -9,6 +9,7 @@ use Hub\Filter\Node\BaseNodeFilter;
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Filter\Filterable;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/handler/answer-status/announcement/class_NodeAnnouncementAnswerOkayHandler.php b/application/hub/classes/handler/answer-status/announcement/class_NodeAnnouncementAnswerOkayHandler.php
index c797e7026..5addf3415 100644
--- a/application/hub/classes/handler/answer-status/announcement/class_NodeAnnouncementAnswerOkayHandler.php
+++ b/application/hub/classes/handler/answer-status/announcement/class_NodeAnnouncementAnswerOkayHandler.php
@@ -5,6 +5,9 @@ namespace Hub\Handler\Node\Announcement\Answer;
 // Import application-specific stuff
 use Hub\Factory\Node\NodeObjectFactory;
 
+// Import framework stuff
+use CoreFramework\Registry\Registry;
+
 /**
  * A AnnouncementAnswerOkay handler
  *
diff --git a/application/hub/classes/helper/connection/class_BaseConnectionHelper.php b/application/hub/classes/helper/connection/class_BaseConnectionHelper.php
index b9c4ac42b..35ae5549c 100644
--- a/application/hub/classes/helper/connection/class_BaseConnectionHelper.php
+++ b/application/hub/classes/helper/connection/class_BaseConnectionHelper.php
@@ -7,6 +7,7 @@ use Hub\Factory\Fragmenter\FragmenterFactory;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registry;
 
 /**
  * A general ConnectionHelper class
diff --git a/application/hub/classes/miner/class_BaseHubMiner.php b/application/hub/classes/miner/class_BaseHubMiner.php
index 7efa3f1f9..79a4d13c4 100644
--- a/application/hub/classes/miner/class_BaseHubMiner.php
+++ b/application/hub/classes/miner/class_BaseHubMiner.php
@@ -8,6 +8,7 @@ use Hub\Generic\BaseHubSystem;
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Object\BaseFrameworkSystem;
+use CoreFramework\Registry\Registry;
 
 /**
  * A general hub miner class
diff --git a/application/hub/classes/nodes/boot/class_HubBootNode.php b/application/hub/classes/nodes/boot/class_HubBootNode.php
index 42e3ff334..a0d91d719 100644
--- a/application/hub/classes/nodes/boot/class_HubBootNode.php
+++ b/application/hub/classes/nodes/boot/class_HubBootNode.php
@@ -4,6 +4,7 @@ namespace Hub\Node\Boot;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 
 /**
diff --git a/application/hub/classes/nodes/class_BaseHubNode.php b/application/hub/classes/nodes/class_BaseHubNode.php
index af7b5d5cd..9c9019a19 100644
--- a/application/hub/classes/nodes/class_BaseHubNode.php
+++ b/application/hub/classes/nodes/class_BaseHubNode.php
@@ -9,6 +9,7 @@ use Hub\Tools\HubTools;
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Object\BaseFrameworkSystem;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 
diff --git a/application/hub/classes/nodes/list/class_HubListNode.php b/application/hub/classes/nodes/list/class_HubListNode.php
index 7964998c4..350335da4 100644
--- a/application/hub/classes/nodes/list/class_HubListNode.php
+++ b/application/hub/classes/nodes/list/class_HubListNode.php
@@ -4,6 +4,7 @@ namespace Hub\Node\Backup;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 
 /**
diff --git a/application/hub/classes/nodes/master/class_HubMasterNode.php b/application/hub/classes/nodes/master/class_HubMasterNode.php
index 0cff95538..14ed6a98f 100644
--- a/application/hub/classes/nodes/master/class_HubMasterNode.php
+++ b/application/hub/classes/nodes/master/class_HubMasterNode.php
@@ -4,6 +4,7 @@ namespace Hub\Node\Master;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 
 /**
diff --git a/application/hub/classes/nodes/regular/class_HubRegularNode.php b/application/hub/classes/nodes/regular/class_HubRegularNode.php
index 0ed0498eb..676230d97 100644
--- a/application/hub/classes/nodes/regular/class_HubRegularNode.php
+++ b/application/hub/classes/nodes/regular/class_HubRegularNode.php
@@ -4,6 +4,7 @@ namespace Hub\Node\Regular;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 
 /**
diff --git a/application/hub/classes/package/class_NetworkPackage.php b/application/hub/classes/package/class_NetworkPackage.php
index 281dc1c88..c4648be8a 100644
--- a/application/hub/classes/package/class_NetworkPackage.php
+++ b/application/hub/classes/package/class_NetworkPackage.php
@@ -11,6 +11,7 @@ use Hub\Tools\HubTools;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registry;
 
 /**
  * A NetworkPackage class. This class implements Deliverable and Receivable
diff --git a/application/hub/classes/pools/class_BasePool.php b/application/hub/classes/pools/class_BasePool.php
index f4939f080..3462b4c4c 100644
--- a/application/hub/classes/pools/class_BasePool.php
+++ b/application/hub/classes/pools/class_BasePool.php
@@ -7,6 +7,7 @@ use Hub\Generic\BaseHubSystem;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registry;
 
 /**
  * A general pool class
diff --git a/application/hub/classes/producer/class_BaseProducer.php b/application/hub/classes/producer/class_BaseProducer.php
index ee6582607..96e06b95c 100644
--- a/application/hub/classes/producer/class_BaseProducer.php
+++ b/application/hub/classes/producer/class_BaseProducer.php
@@ -5,6 +5,7 @@ namespace Hub\Producer;
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Object\BaseFrameworkSystem;
+use CoreFramework\Registry\Registry;
 
 /**
  * A general Producer class
diff --git a/application/hub/classes/registry/objects/class_ObjectTypeRegistry.php b/application/hub/classes/registry/objects/class_ObjectTypeRegistry.php
index 8df6eb9dc..d1d0c13ff 100644
--- a/application/hub/classes/registry/objects/class_ObjectTypeRegistry.php
+++ b/application/hub/classes/registry/objects/class_ObjectTypeRegistry.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace Hub\Registry\ObjectType;
+
 /**
  * A ObjectType registry
  *
diff --git a/application/hub/classes/tags/package/class_PackageTags.php b/application/hub/classes/tags/package/class_PackageTags.php
index 855b240b0..815db1e9f 100644
--- a/application/hub/classes/tags/package/class_PackageTags.php
+++ b/application/hub/classes/tags/package/class_PackageTags.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Tag\Network;
+
+// Import framework stuff
+use CoreFramework\Registry\Registry;
+
 /**
  * A Package tags class
  *
diff --git a/application/hub/classes/tasks/crawler/communicator/class_CrawlerNodeCommunicatorTask.php b/application/hub/classes/tasks/crawler/communicator/class_CrawlerNodeCommunicatorTask.php
index 587f11226..d314e53ea 100644
--- a/application/hub/classes/tasks/crawler/communicator/class_CrawlerNodeCommunicatorTask.php
+++ b/application/hub/classes/tasks/crawler/communicator/class_CrawlerNodeCommunicatorTask.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Crawler\Task\Communicator\Node;
+
+// Import framework stuff
+use CoreFramework\Registry\Registry;
+
 /**
  * A NodeCommunicator task for crawlers
  *
diff --git a/application/hub/classes/tasks/cruncher/class_CruncherWorkUnitFetcherTask.php b/application/hub/classes/tasks/cruncher/class_CruncherWorkUnitFetcherTask.php
index aa995243b..b4c7afa4c 100644
--- a/application/hub/classes/tasks/cruncher/class_CruncherWorkUnitFetcherTask.php
+++ b/application/hub/classes/tasks/cruncher/class_CruncherWorkUnitFetcherTask.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Cruncher\Task\Fetcher\WorkUnit;
+
+// Import framework stuff
+use CoreFramework\Registry\Registry;
+
 /**
  * A WorkUnitFetcher task for crunchers which asks the cruncher to fetch work
  * units or, if enabled in configuration, work on some test units.
diff --git a/application/hub/classes/tasks/miner/block_fetcher/class_MinerBlockFetcherTask.php b/application/hub/classes/tasks/miner/block_fetcher/class_MinerBlockFetcherTask.php
index 74dcd0ef0..899c4dfae 100644
--- a/application/hub/classes/tasks/miner/block_fetcher/class_MinerBlockFetcherTask.php
+++ b/application/hub/classes/tasks/miner/block_fetcher/class_MinerBlockFetcherTask.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Miner\Task\Fetcher\Block;
+
+// Import framework stuff
+use CoreFramework\Registry\Registry;
+
 /**
  * A BlockFetcher task for miners which asks the network for new blocks and
  * starts the "block chain" fetching if no block has been fetched so far.
diff --git a/application/hub/classes/tasks/miner/block_producer/class_MinerRealGenesisBlockProducerTask.php b/application/hub/classes/tasks/miner/block_producer/class_MinerRealGenesisBlockProducerTask.php
index f726aa93e..26ef1fb55 100644
--- a/application/hub/classes/tasks/miner/block_producer/class_MinerRealGenesisBlockProducerTask.php
+++ b/application/hub/classes/tasks/miner/block_producer/class_MinerRealGenesisBlockProducerTask.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Miner\Task\Producer\GenesisBlock;
+
+// Import framework stuff
+use CoreFramework\Registry\Registry;
+
 /**
  * A RealGenesisBlockProducer task for miners
  *
diff --git a/application/hub/classes/tasks/node/announcement/class_NodeAnnouncementTask.php b/application/hub/classes/tasks/node/announcement/class_NodeAnnouncementTask.php
index 73d3d4e45..a5444ad85 100644
--- a/application/hub/classes/tasks/node/announcement/class_NodeAnnouncementTask.php
+++ b/application/hub/classes/tasks/node/announcement/class_NodeAnnouncementTask.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace Hub\Task\Node\Announcement;
+namespace Hub\Node\Task\Announcement;
 
 // Import application-specific stuff
 use Hub\Factory\Node\NodeObjectFactory;
diff --git a/application/hub/classes/tasks/node/dht/class_NodeDhtBootstrapTask.php b/application/hub/classes/tasks/node/dht/class_NodeDhtBootstrapTask.php
index 5d48c5b1d..b3d80ae98 100644
--- a/application/hub/classes/tasks/node/dht/class_NodeDhtBootstrapTask.php
+++ b/application/hub/classes/tasks/node/dht/class_NodeDhtBootstrapTask.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace Hub\Task\Node\Dht\Bootstrap;
+namespace Hub\Node\Task\Dht\Bootstrap;
 
 // Import application-specific stuff
 use Hub\Factory\Dht\DhtObjectFactory;
diff --git a/application/hub/classes/tasks/node/dht/class_NodeDhtInitializationTask.php b/application/hub/classes/tasks/node/dht/class_NodeDhtInitializationTask.php
index 2ab6352a8..5c5a884df 100644
--- a/application/hub/classes/tasks/node/dht/class_NodeDhtInitializationTask.php
+++ b/application/hub/classes/tasks/node/dht/class_NodeDhtInitializationTask.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace Hub\Task\Node\Dht\Initialization;
+namespace Hub\Node\Task\Dht\Initialization;
 
 // Import application-specific stuff
 use Hub\Factory\Dht\DhtObjectFactory;
diff --git a/application/hub/classes/tasks/node/dht/class_NodeDhtLateBootstrapTask.php b/application/hub/classes/tasks/node/dht/class_NodeDhtLateBootstrapTask.php
index e15a6c8d7..10a54ee26 100644
--- a/application/hub/classes/tasks/node/dht/class_NodeDhtLateBootstrapTask.php
+++ b/application/hub/classes/tasks/node/dht/class_NodeDhtLateBootstrapTask.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace Hub\Task\Node\Dht\Bootstrap\Late;
+namespace Hub\Node\Task\Dht\Bootstrap\Late;
 
 // Import application-specific stuff
 use Hub\Factory\Dht\DhtObjectFactory;
diff --git a/application/hub/classes/tasks/node/dht/class_NodeDhtPublicationCheckTask.php b/application/hub/classes/tasks/node/dht/class_NodeDhtPublicationCheckTask.php
index cbdfa5f45..de13d60be 100644
--- a/application/hub/classes/tasks/node/dht/class_NodeDhtPublicationCheckTask.php
+++ b/application/hub/classes/tasks/node/dht/class_NodeDhtPublicationCheckTask.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace Hub\Task\Node\Dht\Check\Publication;
+namespace Hub\Node\Task\Dht\Check\Publication;
 
 // Import application-specific stuff
 use Hub\Factory\Dht\DhtObjectFactory;
diff --git a/application/hub/classes/tasks/node/dht/class_NodeDhtPublicationTask.php b/application/hub/classes/tasks/node/dht/class_NodeDhtPublicationTask.php
index 8d43b6e37..49997f92d 100644
--- a/application/hub/classes/tasks/node/dht/class_NodeDhtPublicationTask.php
+++ b/application/hub/classes/tasks/node/dht/class_NodeDhtPublicationTask.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace Hub\Task\Node\Dht\Publication;
+namespace Hub\Node\Task\Dht\Publication;
 
 // Import application-specific stuff
 use Hub\Factory\Dht\DhtObjectFactory;
diff --git a/application/hub/classes/tasks/node/dht/class_NodeDhtQueryTask.php b/application/hub/classes/tasks/node/dht/class_NodeDhtQueryTask.php
index 9375ddecb..715a3992c 100644
--- a/application/hub/classes/tasks/node/dht/class_NodeDhtQueryTask.php
+++ b/application/hub/classes/tasks/node/dht/class_NodeDhtQueryTask.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace Hub\Task\Node\Dht\Query;
+namespace Hub\Node\Task\Dht\Query;
 
 // Import application-specific stuff
 use Hub\Factory\Dht\DhtObjectFactory;
diff --git a/application/hub/classes/tasks/node/listener/class_NodeSocketListenerTask.php b/application/hub/classes/tasks/node/listener/class_NodeSocketListenerTask.php
index b4dae1fd5..f3e21641f 100644
--- a/application/hub/classes/tasks/node/listener/class_NodeSocketListenerTask.php
+++ b/application/hub/classes/tasks/node/listener/class_NodeSocketListenerTask.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace Hub\Task\Node\Listener\Socket;
+namespace Hub\Node\Task\Listener\Socket;
 
 // Import application-specific stuff
 use Hub\Factory\Node\NodeObjectFactory;
diff --git a/application/hub/classes/tasks/node/self_connect/class_NodeSelfConnectTask.php b/application/hub/classes/tasks/node/self_connect/class_NodeSelfConnectTask.php
index 68bdbc990..a40a87f27 100644
--- a/application/hub/classes/tasks/node/self_connect/class_NodeSelfConnectTask.php
+++ b/application/hub/classes/tasks/node/self_connect/class_NodeSelfConnectTask.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace Hub\Task\Node\SelfConnect;
+namespace Hub\Node\Task\SelfConnect;
 
 // Import application-specific stuff
 use Hub\Factory\Node\NodeObjectFactory;
diff --git a/application/hub/classes/template/class_BaseXmlTemplateEngine.php b/application/hub/classes/template/class_BaseXmlTemplateEngine.php
index 7406f9835..b59b6d72c 100644
--- a/application/hub/classes/template/class_BaseXmlTemplateEngine.php
+++ b/application/hub/classes/template/class_BaseXmlTemplateEngine.php
@@ -4,6 +4,7 @@ namespace Hub\TemplateEngine\Xml;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Registry\Registry;
 
 /**
  * A generic XML template engine class
diff --git a/application/hub/classes/template/objects/class_XmlObjectRegistryTemplateEngine.php b/application/hub/classes/template/objects/class_XmlObjectRegistryTemplateEngine.php
index e2bba47af..da8e6d41d 100644
--- a/application/hub/classes/template/objects/class_XmlObjectRegistryTemplateEngine.php
+++ b/application/hub/classes/template/objects/class_XmlObjectRegistryTemplateEngine.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\TemplateEngine\Xml\ObjectRegistry;
+
+// Import framework stuff
+use CoreFramework\Registry\Registry;
+
 /**
  * An ObjectRegistry template engine class for XML templates
  *