Added missing use statements in framework

304 files changed, 867 insertions, 2 deletions

diff --git a/framework/Caching/TCacheDependencyList.php b/framework/Caching/TCacheDependencyList.php
index a093825a..524404b8 100644
--- a/framework/Caching/TCacheDependencyList.php
+++ b/framework/Caching/TCacheDependencyList.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Caching;
+use Prado\Collections\TList;
 use Prado\Exceptions\TInvalidDataTypeException;
 
 /**
diff --git a/framework/Collections/TMap.php b/framework/Collections/TMap.php
index 3a83fa4c..3ebffbe6 100644
--- a/framework/Collections/TMap.php
+++ b/framework/Collections/TMap.php
@@ -13,6 +13,7 @@ namespace Prado\Collections;
 use Prado\Exceptions\TInvalidDataTypeException;
 use Prado\Exceptions\TInvalidOperationException;
 use Prado\TPropertyValue;
+use Traversable;
 
 /**
  * TMap class
diff --git a/framework/Data/ActiveRecord/Exceptions/TActiveRecordException.php b/framework/Data/ActiveRecord/Exceptions/TActiveRecordException.php
index 063a4cd3..1ec7e597 100644
--- a/framework/Data/ActiveRecord/Exceptions/TActiveRecordException.php
+++ b/framework/Data/ActiveRecord/Exceptions/TActiveRecordException.php
@@ -10,6 +10,8 @@
  */
 
 namespace Prado\Data\ActiveRecord\Exceptions;
+use Prado\Exceptions\TDbException;
+use Prado\Prado;
 
 /**
  * Base exception class for Active Records.
diff --git a/framework/Data/ActiveRecord/Relations/TActiveRecordBelongsTo.php b/framework/Data/ActiveRecord/Relations/TActiveRecordBelongsTo.php
index ad995c30..3ff2d196 100644
--- a/framework/Data/ActiveRecord/Relations/TActiveRecordBelongsTo.php
+++ b/framework/Data/ActiveRecord/Relations/TActiveRecordBelongsTo.php
@@ -14,6 +14,9 @@ namespace Prado\Data\ActiveRecord\Relations;
 /**
  * Loads base active record relationship class.
  */
+use Prado\Data\ActiveRecord\Exceptions\TActiveRecordException;
+use Prado\Prado;
+
 Prado::using('System.Data.ActiveRecord.Relations.TActiveRecordRelation');
 
 /**
diff --git a/framework/Data/ActiveRecord/Relations/TActiveRecordHasMany.php b/framework/Data/ActiveRecord/Relations/TActiveRecordHasMany.php
index 297c3eb2..06c14950 100644
--- a/framework/Data/ActiveRecord/Relations/TActiveRecordHasMany.php
+++ b/framework/Data/ActiveRecord/Relations/TActiveRecordHasMany.php
@@ -14,6 +14,8 @@ namespace Prado\Data\ActiveRecord\Relations;
 /**
  * Loads base active record relations class.
  */
+use Prado\Prado;
+
 Prado::using('System.Data.ActiveRecord.Relations.TActiveRecordRelation');
 
 /**
diff --git a/framework/Data/ActiveRecord/Relations/TActiveRecordHasManyAssociation.php b/framework/Data/ActiveRecord/Relations/TActiveRecordHasManyAssociation.php
index 41a4ab69..f5d644be 100644
--- a/framework/Data/ActiveRecord/Relations/TActiveRecordHasManyAssociation.php
+++ b/framework/Data/ActiveRecord/Relations/TActiveRecordHasManyAssociation.php
@@ -14,6 +14,9 @@ namespace Prado\Data\ActiveRecord\Relations;
 /**
  * Loads base active record relations class.
  */
+use Prado\Data\ActiveRecord\TActiveRecord;
+use Prado\Prado;
+
 Prado::using('System.Data.ActiveRecord.Relations.TActiveRecordRelation');
 
 /**
diff --git a/framework/Data/ActiveRecord/Relations/TActiveRecordHasOne.php b/framework/Data/ActiveRecord/Relations/TActiveRecordHasOne.php
index 7bd54561..320cfc32 100644
--- a/framework/Data/ActiveRecord/Relations/TActiveRecordHasOne.php
+++ b/framework/Data/ActiveRecord/Relations/TActiveRecordHasOne.php
@@ -14,6 +14,9 @@ namespace Prado\Data\ActiveRecord\Relations;
 /**
  * Loads base active record relationship class.
  */
+use Prado\Data\ActiveRecord\Exceptions\TActiveRecordException;
+use Prado\Prado;
+
 Prado::using('System.Data.ActiveRecord.Relations.TActiveRecordRelation');
 
 /**
diff --git a/framework/Data/ActiveRecord/Relations/TActiveRecordRelation.php b/framework/Data/ActiveRecord/Relations/TActiveRecordRelation.php
index e9c79e1a..d7f6d0a7 100644
--- a/framework/Data/ActiveRecord/Relations/TActiveRecordRelation.php
+++ b/framework/Data/ActiveRecord/Relations/TActiveRecordRelation.php
@@ -14,6 +14,10 @@ namespace Prado\Data\ActiveRecord\Relations;
 /**
  * Load active record relationship context.
  */
+use Prado\Data\ActiveRecord\Exceptions\TActiveRecordException;
+use Prado\Data\ActiveRecord\TActiveRecord;
+use Prado\Prado;
+
 Prado::using('System.Data.ActiveRecord.Relations.TActiveRecordRelationContext');
 
 /**
diff --git a/framework/Data/ActiveRecord/Relations/TActiveRecordRelationContext.php b/framework/Data/ActiveRecord/Relations/TActiveRecordRelationContext.php
index 30f423b7..2af4ec7d 100644
--- a/framework/Data/ActiveRecord/Relations/TActiveRecordRelationContext.php
+++ b/framework/Data/ActiveRecord/Relations/TActiveRecordRelationContext.php
@@ -10,6 +10,11 @@
  */
 
 namespace Prado\Data\ActiveRecord\Relations;
+use Prado\Collections\TList;
+use Prado\Data\ActiveRecord\Exceptions\TActiveRecordException;
+use Prado\Data\ActiveRecord\TActiveRecord;
+use Prado\Data\ActiveRecord\TActiveRecordCriteria;
+use Prado\Prado;
 
 /**
  * TActiveRecordRelationContext holds information regarding record relationships
diff --git a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TIbmScaffoldInput.php b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TIbmScaffoldInput.php
index 8f3d78ff..7c55fa14 100644
--- a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TIbmScaffoldInput.php
+++ b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TIbmScaffoldInput.php
@@ -11,6 +11,8 @@
 
 namespace Prado\Data\ActiveRecord\Scaffold\InputBuilder;
 
+use Prado\Prado;
+
 Prado::using('System.Data.ActiveRecord.Scaffold.InputBuilder.TScaffoldInputCommon');
 
 class TIbmScaffoldInput extends TScaffoldInputCommon
diff --git a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TMssqlScaffoldInput.php b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TMssqlScaffoldInput.php
index f713383f..41c50dad 100644
--- a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TMssqlScaffoldInput.php
+++ b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TMssqlScaffoldInput.php
@@ -10,6 +10,8 @@
 
 namespace Prado\Data\ActiveRecord\Scaffold\InputBuilder;
 
+use Prado\Prado;
+
 Prado::using('System.Data.ActiveRecord.Scaffold.InputBuilder.TScaffoldInputCommon');
 
 class TMssqlScaffoldInput extends TScaffoldInputCommon
diff --git a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TMysqlScaffoldInput.php b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TMysqlScaffoldInput.php
index 36585645..cd27fbab 100644
--- a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TMysqlScaffoldInput.php
+++ b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TMysqlScaffoldInput.php
@@ -10,6 +10,8 @@
 
 namespace Prado\Data\ActiveRecord\Scaffold\InputBuilder;
 
+use Prado\Prado;
+
 Prado::using('System.Data.ActiveRecord.Scaffold.InputBuilder.TScaffoldInputCommon');
 
 class TMysqlScaffoldInput extends TScaffoldInputCommon
diff --git a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TPgsqlScaffoldInput.php b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TPgsqlScaffoldInput.php
index 83823403..46da92e8 100644
--- a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TPgsqlScaffoldInput.php
+++ b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TPgsqlScaffoldInput.php
@@ -10,6 +10,8 @@
 
 namespace Prado\Data\ActiveRecord\Scaffold\InputBuilder;
 
+use Prado\Prado;
+
 Prado::using('System.Data.ActiveRecord.Scaffold.InputBuilder.TScaffoldInputCommon');
 
 class TPgsqlScaffoldInput extends TScaffoldInputCommon
diff --git a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TScaffoldInputBase.php b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TScaffoldInputBase.php
index df0b9fa3..d1c964e0 100644
--- a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TScaffoldInputBase.php
+++ b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TScaffoldInputBase.php
@@ -10,6 +10,9 @@
 
 namespace Prado\Data\ActiveRecord\Scaffold\InputBuilder;
 
+use Prado\Data\Common\TDbTableColumn;
+use Prado\Exceptions\TConfigurationException;
+
 class TScaffoldInputBase
 {
 	const DEFAULT_ID = 'scaffold_input';
diff --git a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TScaffoldInputCommon.php b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TScaffoldInputCommon.php
index 85e6a7c3..f366d5eb 100644
--- a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TScaffoldInputCommon.php
+++ b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TScaffoldInputCommon.php
@@ -10,6 +10,23 @@
 
 namespace Prado\Data\ActiveRecord\Scaffold\InputBuilder;
 
+use Prado\Prado;
+use Prado\TPropertyValue;
+use Prado\Web\UI\TControl;
+use Prado\Web\UI\WebControls\TCheckBox;
+use Prado\Web\UI\WebControls\TCheckBoxList;
+use Prado\Web\UI\WebControls\TDataTypeValidator;
+use Prado\Web\UI\WebControls\TDatePicker;
+use Prado\Web\UI\WebControls\TDatePickerInputMode;
+use Prado\Web\UI\WebControls\TDropDownList;
+use Prado\Web\UI\WebControls\TRadioButtonList;
+use Prado\Web\UI\WebControls\TRangeValidator;
+use Prado\Web\UI\WebControls\TRequiredFieldValidator;
+use Prado\Web\UI\WebControls\TTextBox;
+use Prado\Web\UI\WebControls\TTextBoxMode;
+use Prado\Web\UI\WebControls\TValidationDataType;
+use Prado\Web\UI\WebControls\TValidatorDisplayStyle;
+
 Prado::using('System.Data.ActiveRecord.Scaffold.InputBuilder.TScaffoldInputBase');
 
 class TScaffoldInputCommon extends TScaffoldInputBase
diff --git a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TSqliteScaffoldInput.php b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TSqliteScaffoldInput.php
index 2a06548e..38e37a18 100644
--- a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TSqliteScaffoldInput.php
+++ b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TSqliteScaffoldInput.php
@@ -10,6 +10,8 @@
 
 namespace Prado\Data\ActiveRecord\Scaffold\InputBuilder;
 
+use Prado\Prado;
+
 Prado::using('System.Data.ActiveRecord.Scaffold.InputBuilder.TScaffoldInputCommon');
 
 class TSqliteScaffoldInput extends TScaffoldInputCommon
diff --git a/framework/Data/ActiveRecord/Scaffold/TScaffoldBase.php b/framework/Data/ActiveRecord/Scaffold/TScaffoldBase.php
index 209fd5bd..8e044606 100644
--- a/framework/Data/ActiveRecord/Scaffold/TScaffoldBase.php
+++ b/framework/Data/ActiveRecord/Scaffold/TScaffoldBase.php
@@ -14,6 +14,12 @@ namespace Prado\Data\ActiveRecord\Scaffold;
 /**
  * Include the base Active Record class.
  */
+use Prado\Data\ActiveRecord\TActiveRecord;
+use Prado\Exceptions\TConfigurationException;
+use Prado\Prado;
+use Prado\TPropertyValue;
+use Prado\Web\UI\TTemplateControl;
+
 Prado::using('System.Data.ActiveRecord.TActiveRecord');
 
 /**
diff --git a/framework/Data/ActiveRecord/Scaffold/TScaffoldEditView.php b/framework/Data/ActiveRecord/Scaffold/TScaffoldEditView.php
index 234a57f9..df251efa 100644
--- a/framework/Data/ActiveRecord/Scaffold/TScaffoldEditView.php
+++ b/framework/Data/ActiveRecord/Scaffold/TScaffoldEditView.php
@@ -14,6 +14,12 @@ namespace Prado\Data\ActiveRecord\Scaffold;
 /**
  * Load scaffold base.
  */
+use Prado\Data\ActiveRecord\Scaffold\InputBuilder\TScaffoldInputBase;
+use Prado\Exceptions\TConfigurationException;
+use Prado\Prado;
+use Prado\TPropertyValue;
+use Prado\Web\UI\WebControls\TListItemType;
+
 Prado::using('System.Data.ActiveRecord.Scaffold.TScaffoldBase');
 
 /**
diff --git a/framework/Data/ActiveRecord/Scaffold/TScaffoldListView.php b/framework/Data/ActiveRecord/Scaffold/TScaffoldListView.php
index 619436c3..e7e5ab9c 100644
--- a/framework/Data/ActiveRecord/Scaffold/TScaffoldListView.php
+++ b/framework/Data/ActiveRecord/Scaffold/TScaffoldListView.php
@@ -14,6 +14,14 @@ namespace Prado\Data\ActiveRecord\Scaffold;
 /**
  * Load the scaffold base class.
  */
+use Prado\Data\ActiveRecord\TActiveRecordCriteria;
+use Prado\Exceptions\TConfigurationException;
+use Prado\Prado;
+use Prado\TPropertyValue;
+use Prado\Web\UI\WebControls\IItemDataRenderer;
+use Prado\Web\UI\WebControls\TListItemType;
+use Prado\Web\UI\WebControls\TRepeaterCommandEventParameter;
+
 Prado::using('System.Data.ActiveRecord.Scaffold.TScaffoldBase');
 
 /**
diff --git a/framework/Data/ActiveRecord/Scaffold/TScaffoldSearch.php b/framework/Data/ActiveRecord/Scaffold/TScaffoldSearch.php
index 653f06fc..26b8e0b5 100644
--- a/framework/Data/ActiveRecord/Scaffold/TScaffoldSearch.php
+++ b/framework/Data/ActiveRecord/Scaffold/TScaffoldSearch.php
@@ -14,6 +14,9 @@ namespace Prado\Data\ActiveRecord\Scaffold;
 /**
  * Import the scaffold base.
  */
+use Prado\Exceptions\TConfigurationException;
+use Prado\Prado;
+
 Prado::using('System.Data.ActiveRecord.Scaffold.TScaffoldBase');
 
 /**
diff --git a/framework/Data/ActiveRecord/Scaffold/TScaffoldView.php b/framework/Data/ActiveRecord/Scaffold/TScaffoldView.php
index f5e03f02..27adb544 100644
--- a/framework/Data/ActiveRecord/Scaffold/TScaffoldView.php
+++ b/framework/Data/ActiveRecord/Scaffold/TScaffoldView.php
@@ -14,6 +14,8 @@ namespace Prado\Data\ActiveRecord\Scaffold;
 /**
  * Import scaffold base, list, edit and search controls.
  */
+use Prado\Prado;
+
 Prado::using('System.Data.ActiveRecord.Scaffold.TScaffoldBase');
 Prado::using('System.Data.ActiveRecord.Scaffold.TScaffoldListView');
 Prado::using('System.Data.ActiveRecord.Scaffold.TScaffoldEditView');
diff --git a/framework/Data/ActiveRecord/TActiveRecord.php b/framework/Data/ActiveRecord/TActiveRecord.php
index e8fcbb9a..27c51fcd 100644
--- a/framework/Data/ActiveRecord/TActiveRecord.php
+++ b/framework/Data/ActiveRecord/TActiveRecord.php
@@ -14,6 +14,13 @@ namespace Prado\Data\ActiveRecord;
 /**
  * Load record manager, criteria and relations.
  */
+use Prado\Data\ActiveRecord\Exceptions\TActiveRecordException;
+use Prado\Data\ActiveRecord\Relations\TActiveRecordRelationContext;
+use Prado\Data\DataGateway\TSqlCriteria;
+use Prado\Prado;
+use Prado\TPropertyValue;
+use ReflectionClass;
+
 Prado::using('System.Data.ActiveRecord.TActiveRecordManager');
 Prado::using('System.Data.ActiveRecord.TActiveRecordCriteria');
 Prado::using('System.Data.ActiveRecord.Relations.TActiveRecordRelationContext');
diff --git a/framework/Data/ActiveRecord/TActiveRecordChangeEventParameter.php b/framework/Data/ActiveRecord/TActiveRecordChangeEventParameter.php
index 7ee35aed..a41b6df8 100644
--- a/framework/Data/ActiveRecord/TActiveRecordChangeEventParameter.php
+++ b/framework/Data/ActiveRecord/TActiveRecordChangeEventParameter.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Data\ActiveRecord;
+use Prado\TPropertyValue;
 
 /**
  * TActiveRecordChangeEventParameter class
diff --git a/framework/Data/ActiveRecord/TActiveRecordConfig.php b/framework/Data/ActiveRecord/TActiveRecordConfig.php
index e862b52b..3975032a 100644
--- a/framework/Data/ActiveRecord/TActiveRecordConfig.php
+++ b/framework/Data/ActiveRecord/TActiveRecordConfig.php
@@ -11,6 +11,10 @@
 
 namespace Prado\Data\ActiveRecord;
 
+use Prado\Data\TDataSourceConfig;
+use Prado\Prado;
+use Prado\TPropertyValue;
+
 Prado::using('System.Data.TDataSourceConfig');
 Prado::using('System.Data.ActiveRecord.TActiveRecordManager');
 
diff --git a/framework/Data/ActiveRecord/TActiveRecordCriteria.php b/framework/Data/ActiveRecord/TActiveRecordCriteria.php
index 59a80212..74b71511 100644
--- a/framework/Data/ActiveRecord/TActiveRecordCriteria.php
+++ b/framework/Data/ActiveRecord/TActiveRecordCriteria.php
@@ -11,6 +11,9 @@
 
 namespace Prado\Data\ActiveRecord;
 
+use Prado\Data\DataGateway\TSqlCriteria;
+use Prado\Prado;
+
 Prado::using('System.Data.DataGateway.TSqlCriteria');
 
 /**
diff --git a/framework/Data/ActiveRecord/TActiveRecordGateway.php b/framework/Data/ActiveRecord/TActiveRecordGateway.php
index c4eaeb2c..2c231f80 100644
--- a/framework/Data/ActiveRecord/TActiveRecordGateway.php
+++ b/framework/Data/ActiveRecord/TActiveRecordGateway.php
@@ -10,6 +10,15 @@
  */
 
 namespace Prado\Data\ActiveRecord;
+use Prado\Data\ActiveRecord\Exceptions\TActiveRecordException;
+use Prado\Data\ActiveRecord\Relations\TActiveRecordRelationContext;
+use Prado\Data\Common\TDbMetaData;
+use Prado\Data\Common\TDbTableColumn;
+use Prado\Data\DataGateway\TDataGatewayCommand;
+use Prado\Data\DataGateway\TSqlCriteria;
+use Prado\Data\TDbConnection;
+use Prado\Prado;
+use ReflectionClass;
 
 /**
  * TActiveRecordGateway excutes the SQL command queries and returns the data
diff --git a/framework/Data/ActiveRecord/TActiveRecordManager.php b/framework/Data/ActiveRecord/TActiveRecordManager.php
index 63f51bfa..3c21f432 100644
--- a/framework/Data/ActiveRecord/TActiveRecordManager.php
+++ b/framework/Data/ActiveRecord/TActiveRecordManager.php
@@ -11,6 +11,9 @@
 
 namespace Prado\Data\ActiveRecord;
 
+use Prado\Prado;
+use Prado\TPropertyValue;
+
 Prado::using('System.Data.TDbConnection');
 Prado::using('System.Data.ActiveRecord.TActiveRecord');
 Prado::using('System.Data.ActiveRecord.Exceptions.TActiveRecordException');
diff --git a/framework/Data/Common/Mssql/TMssqlCommandBuilder.php b/framework/Data/Common/Mssql/TMssqlCommandBuilder.php
index d2273d72..498c8177 100644
--- a/framework/Data/Common/Mssql/TMssqlCommandBuilder.php
+++ b/framework/Data/Common/Mssql/TMssqlCommandBuilder.php
@@ -11,6 +11,9 @@
 
 namespace Prado\Data\Common\Mssql;
 
+use Prado\Data\Common\TDbCommandBuilder;
+use Prado\Prado;
+
 Prado::using('System.Data.Common.TDbCommandBuilder');
 
 /**
diff --git a/framework/Data/Common/Mssql/TMssqlMetaData.php b/framework/Data/Common/Mssql/TMssqlMetaData.php
index d5581ed0..5c4ec036 100644
--- a/framework/Data/Common/Mssql/TMssqlMetaData.php
+++ b/framework/Data/Common/Mssql/TMssqlMetaData.php
@@ -14,6 +14,10 @@ namespace Prado\Data\Common\Mssql;
 /**
  * Load the base TDbMetaData class.
  */
+use Prado\Data\Common\TDbMetaData;
+use Prado\Exceptions\TDbException;
+use Prado\Prado;
+
 Prado::using('System.Data.Common.TDbMetaData');
 Prado::using('System.Data.Common.Mssql.TMssqlTableInfo');
 
diff --git a/framework/Data/Common/Mssql/TMssqlTableColumn.php b/framework/Data/Common/Mssql/TMssqlTableColumn.php
index 9ce0cc1d..2f75b5be 100644
--- a/framework/Data/Common/Mssql/TMssqlTableColumn.php
+++ b/framework/Data/Common/Mssql/TMssqlTableColumn.php
@@ -14,6 +14,9 @@ namespace Prado\Data\Common\Mssql;
 /**
  * Load common TDbTableCommon class.
  */
+use Prado\Data\Common\TDbTableColumn;
+use Prado\Prado;
+
 Prado::using('System.Data.Common.TDbTableColumn');
 
 /**
diff --git a/framework/Data/Common/Mssql/TMssqlTableInfo.php b/framework/Data/Common/Mssql/TMssqlTableInfo.php
index 005b767f..187eac78 100644
--- a/framework/Data/Common/Mssql/TMssqlTableInfo.php
+++ b/framework/Data/Common/Mssql/TMssqlTableInfo.php
@@ -14,6 +14,9 @@ namespace Prado\Data\Common\Mssql;
 /**
  * Loads the base TDbTableInfo class and TMssqlTableColumn class.
  */
+use Prado\Data\Common\TDbTableInfo;
+use Prado\Prado;
+
 Prado::using('System.Data.Common.TDbTableInfo');
 Prado::using('System.Data.Common.Mssql.TMssqlTableColumn');
 
diff --git a/framework/Data/Common/Mysql/TMysqlCommandBuilder.php b/framework/Data/Common/Mysql/TMysqlCommandBuilder.php
index fd9f9aef..a4f717e0 100644
--- a/framework/Data/Common/Mysql/TMysqlCommandBuilder.php
+++ b/framework/Data/Common/Mysql/TMysqlCommandBuilder.php
@@ -11,6 +11,9 @@
 
 namespace Prado\Data\Common\Mysql;
 
+use Prado\Data\Common\TDbCommandBuilder;
+use Prado\Prado;
+
 Prado::using('System.Data.Common.TDbCommandBuilder');
 
 /**
diff --git a/framework/Data/Common/Mysql/TMysqlMetaData.php b/framework/Data/Common/Mysql/TMysqlMetaData.php
index 668c8413..f2754181 100644
--- a/framework/Data/Common/Mysql/TMysqlMetaData.php
+++ b/framework/Data/Common/Mysql/TMysqlMetaData.php
@@ -14,6 +14,12 @@ namespace Prado\Data\Common\Mysql;
 /**
  * Load the base TDbMetaData class.
  */
+use PDO;
+use Prado\Data\Common\TDbMetaData;
+use Prado\Data\TDbColumnCaseMode;
+use Prado\Exceptions\TDbException;
+use Prado\Prado;
+
 Prado::using('System.Data.Common.TDbMetaData');
 Prado::using('System.Data.Common.Mysql.TMysqlTableInfo');
 
diff --git a/framework/Data/Common/Mysql/TMysqlTableColumn.php b/framework/Data/Common/Mysql/TMysqlTableColumn.php
index 4ad936f5..ef1e35c9 100644
--- a/framework/Data/Common/Mysql/TMysqlTableColumn.php
+++ b/framework/Data/Common/Mysql/TMysqlTableColumn.php
@@ -14,6 +14,9 @@ namespace Prado\Data\Common\Mysql;
 /**
  * Load common TDbTableCommon class.
  */
+use Prado\Data\Common\TDbTableColumn;
+use Prado\Prado;
+
 Prado::using('System.Data.Common.TDbTableColumn');
 
 /**
diff --git a/framework/Data/Common/Mysql/TMysqlTableInfo.php b/framework/Data/Common/Mysql/TMysqlTableInfo.php
index 041b12ff..896f4e59 100644
--- a/framework/Data/Common/Mysql/TMysqlTableInfo.php
+++ b/framework/Data/Common/Mysql/TMysqlTableInfo.php
@@ -14,6 +14,9 @@ namespace Prado\Data\Common\Mysql;
 /**
  * Loads the base TDbTableInfo class and TMysqlTableColumn class.
  */
+use Prado\Data\Common\TDbTableInfo;
+use Prado\Prado;
+
 Prado::using('System.Data.Common.TDbTableInfo');
 Prado::using('System.Data.Common.Mysql.TMysqlTableColumn');
 
diff --git a/framework/Data/Common/Oracle/TOracleCommandBuilder.php b/framework/Data/Common/Oracle/TOracleCommandBuilder.php
index 139ecc78..d9b2b274 100644
--- a/framework/Data/Common/Oracle/TOracleCommandBuilder.php
+++ b/framework/Data/Common/Oracle/TOracleCommandBuilder.php
@@ -12,6 +12,9 @@
 
 namespace Prado\Data\Common\Oracle;
 
+use Prado\Data\Common\TDbCommandBuilder;
+use Prado\Prado;
+
 Prado::using('System.Data.Common.TDbCommandBuilder');
 
 /**
diff --git a/framework/Data/Common/Oracle/TOracleMetaData.php b/framework/Data/Common/Oracle/TOracleMetaData.php
index 2b6e9774..043bf151 100644
--- a/framework/Data/Common/Oracle/TOracleMetaData.php
+++ b/framework/Data/Common/Oracle/TOracleMetaData.php
@@ -14,6 +14,11 @@ namespace Prado\Data\Common\Oracle;
 /**
  * Load the base TDbMetaData class.
  */
+use PDO;
+use Prado\Data\Common\TDbMetaData;
+use Prado\Exceptions\TDbException;
+use Prado\Prado;
+
 Prado::using('System.Data.Common.TDbMetaData');
 Prado::using('System.Data.Common.Oracle.TOracleTableInfo');
 Prado::using('System.Data.Common.Oracle.TOracleTableColumn');
diff --git a/framework/Data/Common/Oracle/TOracleTableColumn.php b/framework/Data/Common/Oracle/TOracleTableColumn.php
index 7b978336..9b9c0ce0 100644
--- a/framework/Data/Common/Oracle/TOracleTableColumn.php
+++ b/framework/Data/Common/Oracle/TOracleTableColumn.php
@@ -14,6 +14,9 @@ namespace Prado\Data\Common\Oracle;
 /**
  * Load common TDbTableCommon class.
  */
+use Prado\Data\Common\TDbTableColumn;
+use Prado\Prado;
+
 Prado::using('System.Data.Common.TDbTableColumn');
 
 /**
diff --git a/framework/Data/Common/Oracle/TOracleTableInfo.php b/framework/Data/Common/Oracle/TOracleTableInfo.php
index d5c66ab8..4f163024 100644
--- a/framework/Data/Common/Oracle/TOracleTableInfo.php
+++ b/framework/Data/Common/Oracle/TOracleTableInfo.php
@@ -11,6 +11,9 @@
  */
 
 namespace Prado\Data\Common\Oracle;
+use Prado\Collections\TMap;
+use Prado\Exceptions\TDbException;
+use Prado\Prado;
 
 /**
  * TDbTableInfo class describes the meta data of a database table.
diff --git a/framework/Data/Common/Pgsql/TPgsqlCommandBuilder.php b/framework/Data/Common/Pgsql/TPgsqlCommandBuilder.php
index d9d0c987..10905a4b 100644
--- a/framework/Data/Common/Pgsql/TPgsqlCommandBuilder.php
+++ b/framework/Data/Common/Pgsql/TPgsqlCommandBuilder.php
@@ -11,6 +11,9 @@
 
 namespace Prado\Data\Common\Pgsql;
 
+use Prado\Data\Common\TDbCommandBuilder;
+use Prado\Prado;
+
 Prado::using('System.Data.Common.TDbCommandBuilder');
 
 /**
diff --git a/framework/Data/Common/Pgsql/TPgsqlMetaData.php b/framework/Data/Common/Pgsql/TPgsqlMetaData.php
index 96f2e091..e848d6af 100644
--- a/framework/Data/Common/Pgsql/TPgsqlMetaData.php
+++ b/framework/Data/Common/Pgsql/TPgsqlMetaData.php
@@ -14,6 +14,10 @@ namespace Prado\Data\Common\Pgsql;
 /**
  * Load the base TDbMetaData class.
  */
+use Prado\Data\Common\TDbMetaData;
+use Prado\Exceptions\TDbException;
+use Prado\Prado;
+
 Prado::using('System.Data.Common.TDbMetaData');
 Prado::using('System.Data.Common.Pgsql.TPgsqlTableInfo');
 
diff --git a/framework/Data/Common/Pgsql/TPgsqlTableColumn.php b/framework/Data/Common/Pgsql/TPgsqlTableColumn.php
index 75bd2aac..98b1f296 100644
--- a/framework/Data/Common/Pgsql/TPgsqlTableColumn.php
+++ b/framework/Data/Common/Pgsql/TPgsqlTableColumn.php
@@ -14,6 +14,9 @@ namespace Prado\Data\Common\Pgsql;
 /**
  * Load common TDbTableCommon class.
  */
+use Prado\Data\Common\TDbTableColumn;
+use Prado\Prado;
+
 Prado::using('System.Data.Common.TDbTableColumn');
 
 /**
diff --git a/framework/Data/Common/Pgsql/TPgsqlTableInfo.php b/framework/Data/Common/Pgsql/TPgsqlTableInfo.php
index bc27a6d5..475b737f 100644
--- a/framework/Data/Common/Pgsql/TPgsqlTableInfo.php
+++ b/framework/Data/Common/Pgsql/TPgsqlTableInfo.php
@@ -14,6 +14,9 @@ namespace Prado\Data\Common\Pgsql;
 /**
  * Loads the base TDbTableInfo class and TPgsqlTableColumn class.
  */
+use Prado\Data\Common\TDbTableInfo;
+use Prado\Prado;
+
 Prado::using('System.Data.Common.TDbTableInfo');
 Prado::using('System.Data.Common.Pgsql.TPgsqlTableColumn');
 
diff --git a/framework/Data/Common/Sqlite/TSqliteCommandBuilder.php b/framework/Data/Common/Sqlite/TSqliteCommandBuilder.php
index fe890a31..8b840207 100644
--- a/framework/Data/Common/Sqlite/TSqliteCommandBuilder.php
+++ b/framework/Data/Common/Sqlite/TSqliteCommandBuilder.php
@@ -11,6 +11,9 @@
 
 namespace Prado\Data\Common\Sqlite;
 
+use Prado\Data\Common\TDbCommandBuilder;
+use Prado\Prado;
+
 Prado::using('System.Data.Common.TDbCommandBuilder');
 
 /**
diff --git a/framework/Data/Common/Sqlite/TSqliteMetaData.php b/framework/Data/Common/Sqlite/TSqliteMetaData.php
index 0985305f..4e0fdaed 100644
--- a/framework/Data/Common/Sqlite/TSqliteMetaData.php
+++ b/framework/Data/Common/Sqlite/TSqliteMetaData.php
@@ -14,6 +14,10 @@ namespace Prado\Data\Common\Sqlite;
 /**
  * Load the base TDbMetaData class.
  */
+use Prado\Data\Common\TDbMetaData;
+use Prado\Exceptions\TDbException;
+use Prado\Prado;
+
 Prado::using('System.Data.Common.TDbMetaData');
 Prado::using('System.Data.Common.Sqlite.TSqliteTableInfo');
 
diff --git a/framework/Data/Common/Sqlite/TSqliteTableColumn.php b/framework/Data/Common/Sqlite/TSqliteTableColumn.php
index ba33b591..daf427f7 100644
--- a/framework/Data/Common/Sqlite/TSqliteTableColumn.php
+++ b/framework/Data/Common/Sqlite/TSqliteTableColumn.php
@@ -14,6 +14,9 @@ namespace Prado\Data\Common\Sqlite;
 /**
  * Load common TDbTableCommon class.
  */
+use Prado\Data\Common\TDbTableColumn;
+use Prado\Prado;
+
 Prado::using('System.Data.Common.TDbTableColumn');
 
 /**
diff --git a/framework/Data/Common/Sqlite/TSqliteTableInfo.php b/framework/Data/Common/Sqlite/TSqliteTableInfo.php
index f08c8229..f0143810 100644
--- a/framework/Data/Common/Sqlite/TSqliteTableInfo.php
+++ b/framework/Data/Common/Sqlite/TSqliteTableInfo.php
@@ -14,6 +14,9 @@ namespace Prado\Data\Common\Sqlite;
 /**
  * Loads the base TDbTableInfo class and TSqliteTableColumn class.
  */
+use Prado\Data\Common\TDbTableInfo;
+use Prado\Prado;
+
 Prado::using('System.Data.Common.TDbTableInfo');
 Prado::using('System.Data.Common.Sqlite.TSqliteTableColumn');
 
diff --git a/framework/Data/Common/TDbCommandBuilder.php b/framework/Data/Common/TDbCommandBuilder.php
index eacc4ad4..3d37238b 100644
--- a/framework/Data/Common/TDbCommandBuilder.php
+++ b/framework/Data/Common/TDbCommandBuilder.php
@@ -10,6 +10,8 @@
  */
 
 namespace Prado\Data\Common;
+use PDO;
+use Traversable;
 
 /**
  * TDbCommandBuilder provides basic methods to create query commands for tables
diff --git a/framework/Data/Common/TDbMetaData.php b/framework/Data/Common/TDbMetaData.php
index 4b289b1c..4f20397c 100644
--- a/framework/Data/Common/TDbMetaData.php
+++ b/framework/Data/Common/TDbMetaData.php
@@ -10,6 +10,13 @@
  */
 
 namespace Prado\Data\Common;
+use Prado\Data\Common\Mssql\TMssqlMetaData;
+use Prado\Data\Common\Mysql\TMysqlMetaData;
+use Prado\Data\Common\Oracle\TOracleMetaData;
+use Prado\Data\Common\Pgsql\TPgsqlMetaData;
+use Prado\Data\Common\Sqlite\TSqliteMetaData;
+use Prado\Exceptions\TDbException;
+use Prado\Prado;
 
 /**
  * TDbMetaData is the base class for retrieving metadata information, such as
diff --git a/framework/Data/Common/TDbTableColumn.php b/framework/Data/Common/TDbTableColumn.php
index f7c83ace..04fcd3e5 100644
--- a/framework/Data/Common/TDbTableColumn.php
+++ b/framework/Data/Common/TDbTableColumn.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Data\Common;
+use PDO;
 
 /**
  * TDbTableColumn class describes the column meta data of the schema for a database table.
diff --git a/framework/Data/Common/TDbTableInfo.php b/framework/Data/Common/TDbTableInfo.php
index a46a1b58..69fa50f0 100644
--- a/framework/Data/Common/TDbTableInfo.php
+++ b/framework/Data/Common/TDbTableInfo.php
@@ -10,6 +10,9 @@
  */
 
 namespace Prado\Data\Common;
+use Prado\Collections\TMap;
+use Prado\Exceptions\TDbException;
+use Prado\Prado;
 
 /**
  * TDbTableInfo class describes the meta data of a database table.
diff --git a/framework/Data/DataGateway/TDataGatewayCommand.php b/framework/Data/DataGateway/TDataGatewayCommand.php
index ee380914..d132dbea 100644
--- a/framework/Data/DataGateway/TDataGatewayCommand.php
+++ b/framework/Data/DataGateway/TDataGatewayCommand.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Data\DataGateway;
+use Prado\Exceptions\TDbException;
 
 /**
  * TDataGatewayCommand is command builder and executor class for
diff --git a/framework/Data/DataGateway/TSqlCriteria.php b/framework/Data/DataGateway/TSqlCriteria.php
index a962b079..d7ca1aca 100644
--- a/framework/Data/DataGateway/TSqlCriteria.php
+++ b/framework/Data/DataGateway/TSqlCriteria.php
@@ -10,6 +10,9 @@
  */
 
 namespace Prado\Data\DataGateway;
+use Prado\Collections\TAttributeCollection;
+use Prado\Exceptions\TException;
+use Traversable;
 
 /**
  * Search criteria for TDbDataGateway.
diff --git a/framework/Data/DataGateway/TTableGateway.php b/framework/Data/DataGateway/TTableGateway.php
index 68efa7f5..db299a1d 100644
--- a/framework/Data/DataGateway/TTableGateway.php
+++ b/framework/Data/DataGateway/TTableGateway.php
@@ -14,6 +14,11 @@ namespace Prado\Data\DataGateway;
 /**
  * Loads the data gateway command builder and sql criteria.
  */
+use Prado\Data\Common\TDbMetaData;
+use Prado\Data\Common\TDbTableInfo;
+use Prado\Exceptions\TDbException;
+use Prado\Prado;
+
 Prado::using('System.Data.DataGateway.TSqlCriteria');
 Prado::using('System.Data.DataGateway.TDataGatewayCommand');
 
diff --git a/framework/Data/SqlMap/Configuration/TDiscriminator.php b/framework/Data/SqlMap/Configuration/TDiscriminator.php
index a5cbed30..90c32cbf 100644
--- a/framework/Data/SqlMap/Configuration/TDiscriminator.php
+++ b/framework/Data/SqlMap/Configuration/TDiscriminator.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Data\SqlMap\Configuration;
+use Prado\TPropertyValue;
 
 /**
  * The TDiscriminator corresponds to the <discriminator> tag within a <resultMap>.
diff --git a/framework/Data/SqlMap/Configuration/TInlineParameterMapParser.php b/framework/Data/SqlMap/Configuration/TInlineParameterMapParser.php
index 26475901..5e433d98 100644
--- a/framework/Data/SqlMap/Configuration/TInlineParameterMapParser.php
+++ b/framework/Data/SqlMap/Configuration/TInlineParameterMapParser.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Data\SqlMap\Configuration;
+use Prado\Data\SqlMap\DataMapper\TSqlMapUndefinedException;
 
 /**
  * TInlineParameterMapParser class.
diff --git a/framework/Data/SqlMap/Configuration/TParameterMap.php b/framework/Data/SqlMap/Configuration/TParameterMap.php
index d1e78984..ee2ec375 100644
--- a/framework/Data/SqlMap/Configuration/TParameterMap.php
+++ b/framework/Data/SqlMap/Configuration/TParameterMap.php
@@ -10,6 +10,12 @@
  */
 
 namespace Prado\Data\SqlMap\Configuration;
+use Prado\Collections\TList;
+use Prado\Collections\TMap;
+use Prado\Data\SqlMap\DataMapper\TInvalidPropertyException;
+use Prado\Data\SqlMap\DataMapper\TPropertyAccess;
+use Prado\Data\SqlMap\DataMapper\TSqlMapException;
+use Prado\Prado;
 
 /**
  * TParameterMap corresponds to the <parameterMap> element.
diff --git a/framework/Data/SqlMap/Configuration/TResultMap.php b/framework/Data/SqlMap/Configuration/TResultMap.php
index e183438f..c386b212 100644
--- a/framework/Data/SqlMap/Configuration/TResultMap.php
+++ b/framework/Data/SqlMap/Configuration/TResultMap.php
@@ -10,6 +10,8 @@
  */
 
 namespace Prado\Data\SqlMap\Configuration;
+use Prado\Collections\TMap;
+use Prado\Data\SqlMap\DataMapper\TSqlMapException;
 
 /**
  * TResultMap corresponds to <resultMap> mapping tag.
diff --git a/framework/Data/SqlMap/Configuration/TResultProperty.php b/framework/Data/SqlMap/Configuration/TResultProperty.php
index 59ce44a9..e50b10ac 100644
--- a/framework/Data/SqlMap/Configuration/TResultProperty.php
+++ b/framework/Data/SqlMap/Configuration/TResultProperty.php
@@ -10,6 +10,11 @@
  */
 
 namespace Prado\Data\SqlMap\Configuration;
+use Prado\Collections\TList;
+use Prado\Data\SqlMap\DataMapper\TPropertyAccess;
+use Prado\Prado;
+use Prado\TPropertyValue;
+use ReflectionClass;
 
 /**
  * TResultProperty corresponds a <property> tags inside a <resultMap> tag.
diff --git a/framework/Data/SqlMap/Configuration/TSqlMapCacheModel.php b/framework/Data/SqlMap/Configuration/TSqlMapCacheModel.php
index 393b61e6..264997c0 100644
--- a/framework/Data/SqlMap/Configuration/TSqlMapCacheModel.php
+++ b/framework/Data/SqlMap/Configuration/TSqlMapCacheModel.php
@@ -10,6 +10,8 @@
  */
 
 namespace Prado\Data\SqlMap\Configuration;
+use Prado\Prado;
+use Prado\TPropertyValue;
 
 /**
  * TSqlMapCacheModel corresponds to the <cacheModel> sql mapping configuration tag.
diff --git a/framework/Data/SqlMap/Configuration/TSqlMapSelectKey.php b/framework/Data/SqlMap/Configuration/TSqlMapSelectKey.php
index 89afe545..21eba3e7 100644
--- a/framework/Data/SqlMap/Configuration/TSqlMapSelectKey.php
+++ b/framework/Data/SqlMap/Configuration/TSqlMapSelectKey.php
@@ -11,6 +11,7 @@
  */
 
 namespace Prado\Data\SqlMap\Configuration;
+use Prado\Data\SqlMap\DataMapper\TSqlMapConfigurationException;
 
 /**
  * TSqlMapSelect corresponds to the <selectKey> element.
diff --git a/framework/Data/SqlMap/Configuration/TSqlMapXmlConfigBuilder.php b/framework/Data/SqlMap/Configuration/TSqlMapXmlConfigBuilder.php
index b74340bd..765e0d9f 100644
--- a/framework/Data/SqlMap/Configuration/TSqlMapXmlConfigBuilder.php
+++ b/framework/Data/SqlMap/Configuration/TSqlMapXmlConfigBuilder.php
@@ -11,6 +11,9 @@
 
 namespace Prado\Data\SqlMap\Configuration;
 
+use Prado\Data\SqlMap\DataMapper\TSqlMapConfigurationException;
+use Prado\Prado;
+
 Prado::using('System.Data.SqlMap.Configuration.TSqlMapStatement');
 
 /**
diff --git a/framework/Data/SqlMap/Configuration/TSqlMapXmlConfiguration.php b/framework/Data/SqlMap/Configuration/TSqlMapXmlConfiguration.php
index 91d9cbb3..8d6a6939 100644
--- a/framework/Data/SqlMap/Configuration/TSqlMapXmlConfiguration.php
+++ b/framework/Data/SqlMap/Configuration/TSqlMapXmlConfiguration.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Data\SqlMap\Configuration;
+use Prado\Data\SqlMap\DataMapper\TSqlMapConfigurationException;
 
 /**
  * TSqlMapXmlConfig class.
diff --git a/framework/Data/SqlMap/Configuration/TSqlMapXmlMappingConfiguration.php b/framework/Data/SqlMap/Configuration/TSqlMapXmlMappingConfiguration.php
index ae2a454e..d9d2666a 100644
--- a/framework/Data/SqlMap/Configuration/TSqlMapXmlMappingConfiguration.php
+++ b/framework/Data/SqlMap/Configuration/TSqlMapXmlMappingConfiguration.php
@@ -10,6 +10,18 @@
  */
 
 namespace Prado\Data\SqlMap\Configuration;
+use Prado\Caching\TFileCacheDependency;
+use Prado\Data\SqlMap\DataMapper\TPropertyAccess;
+use Prado\Data\SqlMap\DataMapper\TSqlMapConfigurationException;
+use Prado\Data\SqlMap\Statements\TCachingStatement;
+use Prado\Data\SqlMap\Statements\TDeleteMappedStatement;
+use Prado\Data\SqlMap\Statements\TInsertMappedStatement;
+use Prado\Data\SqlMap\Statements\TMappedStatement;
+use Prado\Data\SqlMap\Statements\TSimpleDynamicSql;
+use Prado\Data\SqlMap\Statements\TStaticSql;
+use Prado\Data\SqlMap\Statements\TUpdateMappedStatement;
+use Prado\Prado;
+use Prado\TApplicationMode;
 
 /**
  * Loads the statements, result maps, parameters maps from xml configuration.
diff --git a/framework/Data/SqlMap/DataMapper/TFastSqlMapApplicationCache.php b/framework/Data/SqlMap/DataMapper/TFastSqlMapApplicationCache.php
index d9e78c12..e1b77595 100644
--- a/framework/Data/SqlMap/DataMapper/TFastSqlMapApplicationCache.php
+++ b/framework/Data/SqlMap/DataMapper/TFastSqlMapApplicationCache.php
@@ -10,6 +10,8 @@
  */
 
 namespace Prado\Data\SqlMap\DataMapper;
+use Prado\Caching\ICache;
+use Prado\Prado;
 
 /**
  * TFastSqlMapApplicationCache class file
diff --git a/framework/Data/SqlMap/DataMapper/TSqlMapApplicationCache.php b/framework/Data/SqlMap/DataMapper/TSqlMapApplicationCache.php
index 0c52335f..ab156bfe 100644
--- a/framework/Data/SqlMap/DataMapper/TSqlMapApplicationCache.php
+++ b/framework/Data/SqlMap/DataMapper/TSqlMapApplicationCache.php
@@ -10,6 +10,10 @@
  */
 
 namespace Prado\Data\SqlMap\DataMapper;
+use Prado\Caching\ICache;
+use Prado\Collections\TList;
+use Prado\Data\SqlMap\Configuration\TSqlMapCacheModel;
+use Prado\Prado;
 
 /**
  * TSqlMapApplicationCache uses the default Prado application cache for
diff --git a/framework/Data/SqlMap/DataMapper/TSqlMapCache.php b/framework/Data/SqlMap/DataMapper/TSqlMapCache.php
index 426126ad..aabff1bd 100644
--- a/framework/Data/SqlMap/DataMapper/TSqlMapCache.php
+++ b/framework/Data/SqlMap/DataMapper/TSqlMapCache.php
@@ -10,6 +10,10 @@
  */
 
 namespace Prado\Data\SqlMap\DataMapper;
+use Prado\Caching\ICache;
+use Prado\Collections\TList;
+use Prado\Collections\TMap;
+use Prado\TPropertyValue;
 
 /**
  * Allow different implementation of caching strategy. See <tt>TSqlMapFifoCache</tt>
diff --git a/framework/Data/SqlMap/DataMapper/TSqlMapException.php b/framework/Data/SqlMap/DataMapper/TSqlMapException.php
index 0452237a..65ee6d18 100644
--- a/framework/Data/SqlMap/DataMapper/TSqlMapException.php
+++ b/framework/Data/SqlMap/DataMapper/TSqlMapException.php
@@ -1,6 +1,10 @@
 <?php
 
 namespace Prado\Data\SqlMap\DataMapper;
+use Prado\Exceptions\TException;
+use Prado\Prado;
+use Prado\TPropertyValue;
+use SimpleXMLElement;
 
 /**
  * TSqlMapException is the base exception class for all SqlMap exceptions.
diff --git a/framework/Data/SqlMap/DataMapper/TSqlMapPagedList.php b/framework/Data/SqlMap/DataMapper/TSqlMapPagedList.php
index 9dad8d24..248aaa9b 100644
--- a/framework/Data/SqlMap/DataMapper/TSqlMapPagedList.php
+++ b/framework/Data/SqlMap/DataMapper/TSqlMapPagedList.php
@@ -11,6 +11,11 @@
 
 namespace Prado\Data\SqlMap\DataMapper;
 
+use Prado\Collections\TList;
+use Prado\Collections\TPagedList;
+use Prado\Data\SqlMap\Statements\IMappedStatement;
+use Prado\Prado;
+
 Prado::using('System.Collections.TPagedList');
 
 /**
diff --git a/framework/Data/SqlMap/DataMapper/TSqlMapTypeHandlerRegistry.php b/framework/Data/SqlMap/DataMapper/TSqlMapTypeHandlerRegistry.php
index d3c3bd81..6d3bc81f 100644
--- a/framework/Data/SqlMap/DataMapper/TSqlMapTypeHandlerRegistry.php
+++ b/framework/Data/SqlMap/DataMapper/TSqlMapTypeHandlerRegistry.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Data\SqlMap\DataMapper;
+use Prado\Prado;
 
 /**
  * TTypeHandlerFactory provides type handler classes to convert database field type
diff --git a/framework/Data/SqlMap/Statements/TCachingStatement.php b/framework/Data/SqlMap/Statements/TCachingStatement.php
index 745249e4..180a9375 100644
--- a/framework/Data/SqlMap/Statements/TCachingStatement.php
+++ b/framework/Data/SqlMap/Statements/TCachingStatement.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Data\SqlMap\Statements;
+use Prado\Data\SqlMap\Configuration\TSqlMapCacheKey;
 
 /**
  * TCacheingStatement class.
diff --git a/framework/Data/SqlMap/Statements/TInsertMappedStatement.php b/framework/Data/SqlMap/Statements/TInsertMappedStatement.php
index eac88d2d..4b8a01d8 100644
--- a/framework/Data/SqlMap/Statements/TInsertMappedStatement.php
+++ b/framework/Data/SqlMap/Statements/TInsertMappedStatement.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Data\SqlMap\Statements;
+use Prado\Data\SqlMap\DataMapper\TSqlMapExecutionException;
 
 /**
  * TInsertMappedStatement class.
diff --git a/framework/Data/SqlMap/Statements/TMappedStatement.php b/framework/Data/SqlMap/Statements/TMappedStatement.php
index 2f7e8619..36375dd7 100644
--- a/framework/Data/SqlMap/Statements/TMappedStatement.php
+++ b/framework/Data/SqlMap/Statements/TMappedStatement.php
@@ -10,6 +10,16 @@
  */
 
 namespace Prado\Data\SqlMap\Statements;
+use Prado\Collections\TList;
+use Prado\Data\ActiveRecord\TActiveRecord;
+use Prado\Data\SqlMap\Configuration\TResultProperty;
+use Prado\Data\SqlMap\Configuration\TSqlMapInsert;
+use Prado\Data\SqlMap\Configuration\TSqlMapStatement;
+use Prado\Data\SqlMap\DataMapper\TLazyLoadList;
+use Prado\Data\SqlMap\DataMapper\TPropertyAccess;
+use Prado\Data\SqlMap\DataMapper\TSqlMapExecutionException;
+use Prado\Data\SqlMap\TSqlMapManager;
+use Prado\Exceptions\TInvalidDataValueException;
 
 /**
  * TMappedStatement class executes SQL mapped statements. Mapped Statements can
diff --git a/framework/Data/SqlMap/Statements/TPreparedCommand.php b/framework/Data/SqlMap/Statements/TPreparedCommand.php
index 4f59f4c7..9ddfc67e 100644
--- a/framework/Data/SqlMap/Statements/TPreparedCommand.php
+++ b/framework/Data/SqlMap/Statements/TPreparedCommand.php
@@ -11,6 +11,11 @@
 
 namespace Prado\Data\SqlMap\Statements;
 
+use Prado\Data\Common\TDbCommandBuilder;
+use Prado\Data\Common\TDbMetaData;
+use Prado\Data\SqlMap\TSqlMapManager;
+use Prado\Prado;
+
 Prado::using('System.Data.Common.TDbMetaData');
 Prado::using('System.Data.Common.TDbCommandBuilder');
 
diff --git a/framework/Data/SqlMap/Statements/TPreparedStatement.php b/framework/Data/SqlMap/Statements/TPreparedStatement.php
index b978996e..30bccedd 100644
--- a/framework/Data/SqlMap/Statements/TPreparedStatement.php
+++ b/framework/Data/SqlMap/Statements/TPreparedStatement.php
@@ -10,6 +10,8 @@
  */
 
 namespace Prado\Data\SqlMap\Statements;
+use Prado\Collections\TList;
+use Prado\Collections\TMap;
 
 /**
  * TpreparedStatement class.
diff --git a/framework/Data/SqlMap/Statements/TSelectMappedStatement.php b/framework/Data/SqlMap/Statements/TSelectMappedStatement.php
index f97176e9..3c4aa376 100644
--- a/framework/Data/SqlMap/Statements/TSelectMappedStatement.php
+++ b/framework/Data/SqlMap/Statements/TSelectMappedStatement.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Data\SqlMap\Statements;
+use Prado\Data\SqlMap\DataMapper\TSqlMapExecutionException;
 
 /**
  * TSelectMappedStatment class.
diff --git a/framework/Data/SqlMap/Statements/TSimpleDynamicSql.php b/framework/Data/SqlMap/Statements/TSimpleDynamicSql.php
index 147e5177..9a7d6543 100644
--- a/framework/Data/SqlMap/Statements/TSimpleDynamicSql.php
+++ b/framework/Data/SqlMap/Statements/TSimpleDynamicSql.php
@@ -10,6 +10,8 @@
  */
 
 namespace Prado\Data\SqlMap\Statements;
+use Prado\Data\SqlMap\Configuration\TSimpleDynamicParser;
+use Prado\Data\SqlMap\DataMapper\TPropertyAccess;
 
 /**
  * TSimpleDynamicSql class.
diff --git a/framework/Data/SqlMap/Statements/TSqlMapObjectCollectionTree.php b/framework/Data/SqlMap/Statements/TSqlMapObjectCollectionTree.php
index 041eda6b..fa2bf1cd 100644
--- a/framework/Data/SqlMap/Statements/TSqlMapObjectCollectionTree.php
+++ b/framework/Data/SqlMap/Statements/TSqlMapObjectCollectionTree.php
@@ -10,6 +10,9 @@
  */
 
 namespace Prado\Data\SqlMap\Statements;
+use Prado\Collections\TList;
+use Prado\Data\SqlMap\DataMapper\TPropertyAccess;
+use Prado\Data\SqlMap\DataMapper\TSqlMapExecutionException;
 
 /**
  * TSQLMapObjectCollectionTree class.
diff --git a/framework/Data/SqlMap/Statements/TUpdateMappedStatement.php b/framework/Data/SqlMap/Statements/TUpdateMappedStatement.php
index 265876f5..f64a0aa4 100644
--- a/framework/Data/SqlMap/Statements/TUpdateMappedStatement.php
+++ b/framework/Data/SqlMap/Statements/TUpdateMappedStatement.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Data\SqlMap\Statements;
+use Prado\Data\SqlMap\DataMapper\TSqlMapExecutionException;
 
 /**
  * TUpdateMappedStatement class.
diff --git a/framework/Data/SqlMap/TSqlMapConfig.php b/framework/Data/SqlMap/TSqlMapConfig.php
index 80636376..299c57ff 100644
--- a/framework/Data/SqlMap/TSqlMapConfig.php
+++ b/framework/Data/SqlMap/TSqlMapConfig.php
@@ -11,6 +11,12 @@
 
 namespace Prado\Data\SqlMap;
 
+use Prado\Data\TDataSourceConfig;
+use Prado\Exceptions\TConfigurationException;
+use Prado\Prado;
+use Prado\TApplicationMode;
+use Prado\TPropertyValue;
+
 Prado::using('System.Data.TDataSourceConfig');
 
 /**
diff --git a/framework/Data/SqlMap/TSqlMapGateway.php b/framework/Data/SqlMap/TSqlMapGateway.php
index 83f90572..b52fda86 100644
--- a/framework/Data/SqlMap/TSqlMapGateway.php
+++ b/framework/Data/SqlMap/TSqlMapGateway.php
@@ -11,6 +11,9 @@
 
 namespace Prado\Data\SqlMap;
 
+use Prado\Data\SqlMap\DataMapper\TSqlMapPagedList;
+use Prado\Prado;
+
 Prado::using('System.Data.SqlMap.TSqlMapManager');
 
 /**
diff --git a/framework/Data/SqlMap/TSqlMapManager.php b/framework/Data/SqlMap/TSqlMapManager.php
index 55a15b72..e1331bef 100644
--- a/framework/Data/SqlMap/TSqlMapManager.php
+++ b/framework/Data/SqlMap/TSqlMapManager.php
@@ -11,6 +11,19 @@
 
 namespace Prado\Data\SqlMap;
 
+use Prado\Caching\TChainedCacheDependency;
+use Prado\Collections\TMap;
+use Prado\Data\SqlMap\Configuration\TParameterMap;
+use Prado\Data\SqlMap\Configuration\TResultMap;
+use Prado\Data\SqlMap\Configuration\TSqlMapCacheModel;
+use Prado\Data\SqlMap\Configuration\TSqlMapXmlConfiguration;
+use Prado\Data\SqlMap\DataMapper\TSqlMapConfigurationException;
+use Prado\Data\SqlMap\DataMapper\TSqlMapDuplicateException;
+use Prado\Data\SqlMap\DataMapper\TSqlMapTypeHandlerRegistry;
+use Prado\Data\SqlMap\DataMapper\TSqlMapUndefinedException;
+use Prado\Data\SqlMap\Statements\IMappedStatement;
+use Prado\Prado;
+
 Prado::using('System.Data.SqlMap.TSqlMapGateway');
 Prado::using('System.Data.SqlMap.DataMapper.TSqlMapException');
 Prado::using('System.Data.SqlMap.DataMapper.TSqlMapTypeHandlerRegistry');
diff --git a/framework/Data/TDataSourceConfig.php b/framework/Data/TDataSourceConfig.php
index f5477d30..b9c11b54 100644
--- a/framework/Data/TDataSourceConfig.php
+++ b/framework/Data/TDataSourceConfig.php
@@ -11,6 +11,10 @@
 
 namespace Prado\Data;
 
+use Prado\Exceptions\TConfigurationException;
+use Prado\Prado;
+use Prado\TApplication;
+
 Prado::using('System.Data.TDbConnection');
 
 /**
diff --git a/framework/Data/TDbCommand.php b/framework/Data/TDbCommand.php
index 61d69b3d..1de420a3 100644
--- a/framework/Data/TDbCommand.php
+++ b/framework/Data/TDbCommand.php
@@ -10,6 +10,12 @@
  */
 
 namespace Prado\Data;
+use Exception;
+use PDO;
+use PDOStatement;
+use Prado\Exceptions\TDbException;
+use Prado\Prado;
+use Prado\TApplicationMode;
 
 /**
  * TDbCommand class.
diff --git a/framework/Data/TDbConnection.php b/framework/Data/TDbConnection.php
index ea07c084..e807d618 100644
--- a/framework/Data/TDbConnection.php
+++ b/framework/Data/TDbConnection.php
@@ -11,6 +11,13 @@
 
 namespace Prado\Data;
 
+use PDO;
+use PDOException;
+use Prado\Data\Common\TDbMetaData;
+use Prado\Exceptions\TDbException;
+use Prado\Prado;
+use Prado\TPropertyValue;
+
 Prado::using('System.Data.TDbTransaction');
 Prado::using('System.Data.TDbCommand');
 
diff --git a/framework/Data/TDbDataReader.php b/framework/Data/TDbDataReader.php
index 5f8541d9..e2f28aa0 100644
--- a/framework/Data/TDbDataReader.php
+++ b/framework/Data/TDbDataReader.php
@@ -10,6 +10,8 @@
  */
 
 namespace Prado\Data;
+use PDO;
+use Prado\Exceptions\TDbException;
 
 /**
  * TDbDataReader class.
diff --git a/framework/Data/TDbTransaction.php b/framework/Data/TDbTransaction.php
index e9c245f9..0226b4ba 100644
--- a/framework/Data/TDbTransaction.php
+++ b/framework/Data/TDbTransaction.php
@@ -11,6 +11,10 @@
 
 namespace Prado\Data;
 
+use Prado\Exceptions\TDbException;
+use Prado\Prado;
+use Prado\TPropertyValue;
+
 Prado::using('System.Data.TDbDataReader');
 
 /**
diff --git a/framework/I18N/TChoiceFormat.php b/framework/I18N/TChoiceFormat.php
index 5fa232b8..830ab3ef 100644
--- a/framework/I18N/TChoiceFormat.php
+++ b/framework/I18N/TChoiceFormat.php
@@ -14,6 +14,9 @@ namespace Prado\I18N;
  /**
  * Get the ChoiceFormat class.
  */
+use Prado\I18N\core\ChoiceFormat;
+use Prado\Prado;
+
 Prado::using('System.I18N.core.ChoiceFormat');
 Prado::using('System.I18N.TTranslate');
 
diff --git a/framework/I18N/TDateFormat.php b/framework/I18N/TDateFormat.php
index eedabfb4..48e1ae75 100644
--- a/framework/I18N/TDateFormat.php
+++ b/framework/I18N/TDateFormat.php
@@ -14,6 +14,9 @@ namespace Prado\I18N;
 /**
  * Get the DateFormat class.
  */
+use Prado\I18N\core\DateFormat;
+use Prado\Prado;
+
 Prado::using('System.I18N.core.DateFormat');
 
 /**
diff --git a/framework/I18N/TGlobalization.php b/framework/I18N/TGlobalization.php
index f50fdb7e..118ac168 100644
--- a/framework/I18N/TGlobalization.php
+++ b/framework/I18N/TGlobalization.php
@@ -10,6 +10,8 @@
  */
 
 namespace Prado\I18N;
+use Prado\Exceptions\TConfigurationException;
+use Prado\Prado;
 use Prado\TApplication;
 use Prado\TPropertyValue;
 
diff --git a/framework/I18N/TI18NControl.php b/framework/I18N/TI18NControl.php
index b137604c..ee506ada 100644
--- a/framework/I18N/TI18NControl.php
+++ b/framework/I18N/TI18NControl.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\I18N;
+use Prado\Web\UI\TControl;
 
 /**
  * TI18NControl class.
diff --git a/framework/I18N/TNumberFormat.php b/framework/I18N/TNumberFormat.php
index 7940c785..c452ad56 100644
--- a/framework/I18N/TNumberFormat.php
+++ b/framework/I18N/TNumberFormat.php
@@ -14,6 +14,10 @@ namespace Prado\I18N;
 /**
  * Get the NumberFormat class.
  */
+use Prado\Exceptions\TInvalidDataValueException;
+use Prado\I18N\core\NumberFormat;
+use Prado\Prado;
+
 Prado::using('System.I18N.core.NumberFormat');
 
 /**
diff --git a/framework/I18N/TTranslate.php b/framework/I18N/TTranslate.php
index 9e433ddc..a4c8d7ce 100644
--- a/framework/I18N/TTranslate.php
+++ b/framework/I18N/TTranslate.php
@@ -14,6 +14,12 @@ namespace Prado\I18N;
 /**
  * Get the parent control class.
  */
+use Prado\Collections\TAttributeCollection;
+use Prado\IO\TTextWriter;
+use Prado\Prado;
+use Prado\TPropertyValue;
+use Prado\Web\UI\TControl;
+
 Prado::using('System.I18N.TI18NControl');
 
 /**
diff --git a/framework/I18N/TTranslateParameter.php b/framework/I18N/TTranslateParameter.php
index 5d8cdf23..6163b80c 100644
--- a/framework/I18N/TTranslateParameter.php
+++ b/framework/I18N/TTranslateParameter.php
@@ -10,6 +10,11 @@
  */
 
 namespace Prado\I18N;
+use Prado\Exceptions\TException;
+use Prado\IO\TTextWriter;
+use Prado\Prado;
+use Prado\TPropertyValue;
+use Prado\Web\UI\TControl;
 
 /**
  * TTranslateParameter component should be used inside the TTranslate component to
diff --git a/framework/I18N/Translation.php b/framework/I18N/Translation.php
index 0f2bc614..3a58b54b 100644
--- a/framework/I18N/Translation.php
+++ b/framework/I18N/Translation.php
@@ -14,6 +14,12 @@ namespace Prado\I18N;
 /**
  * Get the MessageFormat class.
  */
+use Prado\I18N\core\MessageCache;
+use Prado\I18N\core\MessageFormat;
+use Prado\I18N\core\MessageSource;
+use Prado\Prado;
+use Prado\TPropertyValue;
+
 Prado::using('System.I18N.core.MessageFormat');
 
 
diff --git a/framework/I18N/core/ChoiceFormat.php b/framework/I18N/core/ChoiceFormat.php
index c42a2dda..61db3e54 100644
--- a/framework/I18N/core/ChoiceFormat.php
+++ b/framework/I18N/core/ChoiceFormat.php
@@ -17,6 +17,7 @@
  */
 
 namespace Prado\I18N\core;
+use Exception;
 
 /**
  * ChoiceFormat class.
diff --git a/framework/I18N/core/CultureInfo.php b/framework/I18N/core/CultureInfo.php
index 7283175a..b931ec39 100644
--- a/framework/I18N/core/CultureInfo.php
+++ b/framework/I18N/core/CultureInfo.php
@@ -17,6 +17,7 @@
  */
 
 namespace Prado\I18N\core;
+use Exception;
 
 /**
  * CultureInfo class.
diff --git a/framework/I18N/core/DateFormat.php b/framework/I18N/core/DateFormat.php
index 22e86de8..57f04468 100644
--- a/framework/I18N/core/DateFormat.php
+++ b/framework/I18N/core/DateFormat.php
@@ -20,6 +20,9 @@ namespace Prado\I18N\core;
 /**
  * Get the DateTimeFormatInfo class.
  */
+use Exception;
+use Prado\Prado;
+
 require_once(dirname(__FILE__).'/DateTimeFormatInfo.php');
 
 /**
diff --git a/framework/I18N/core/DateTimeFormatInfo.php b/framework/I18N/core/DateTimeFormatInfo.php
index 2f64569c..e6a28041 100644
--- a/framework/I18N/core/DateTimeFormatInfo.php
+++ b/framework/I18N/core/DateTimeFormatInfo.php
@@ -21,6 +21,8 @@ namespace Prado\I18N\core;
 /**
  * Get the CultureInfo class.
  */
+use Exception;
+
 require_once(dirname(__FILE__).'/CultureInfo.php');
 
 
diff --git a/framework/I18N/core/Gettext/TGettext.php b/framework/I18N/core/Gettext/TGettext.php
index b9207eb8..464e2f25 100644
--- a/framework/I18N/core/Gettext/TGettext.php
+++ b/framework/I18N/core/Gettext/TGettext.php
@@ -42,6 +42,7 @@ namespace Prado\I18N\core\Gettext;
  * Use PHPs builtin error messages
  */
 //ini_set('track_errors', true);
+use Exception;
 
 /**
  * File_Gettext
diff --git a/framework/I18N/core/MessageCache.php b/framework/I18N/core/MessageCache.php
index 722f2aac..3cc10995 100644
--- a/framework/I18N/core/MessageCache.php
+++ b/framework/I18N/core/MessageCache.php
@@ -10,6 +10,8 @@ namespace Prado\I18N\core;
 /**
  * Load the cache lite library.
  */
+use Exception;
+
 require_once(dirname(__FILE__).'/TCache_Lite.php');
 
 /**
diff --git a/framework/I18N/core/MessageSource.php b/framework/I18N/core/MessageSource.php
index 4643b058..a3308621 100644
--- a/framework/I18N/core/MessageSource.php
+++ b/framework/I18N/core/MessageSource.php
@@ -20,6 +20,8 @@ namespace Prado\I18N\core;
  /**
   * Get the IMessageSource interface.
   */
+use Exception;
+
 require_once(dirname(__FILE__).'/IMessageSource.php');
 
 /**
diff --git a/framework/I18N/core/MessageSource_Database.php b/framework/I18N/core/MessageSource_Database.php
index d887954d..8e4cf393 100644
--- a/framework/I18N/core/MessageSource_Database.php
+++ b/framework/I18N/core/MessageSource_Database.php
@@ -19,6 +19,11 @@ namespace Prado\I18N\core;
 /**
  * Get the MessageSource class file.
  */
+use PDO;
+use Prado\Data\TDataSourceConfig;
+use Prado\Exceptions\TConfigurationException;
+use Prado\Prado;
+
 require_once(dirname(__FILE__).'/MessageSource.php');
 
 /**
diff --git a/framework/I18N/core/MessageSource_MySQL.php b/framework/I18N/core/MessageSource_MySQL.php
index 58618dc3..49263e08 100644
--- a/framework/I18N/core/MessageSource_MySQL.php
+++ b/framework/I18N/core/MessageSource_MySQL.php
@@ -21,6 +21,8 @@ namespace Prado\I18N\core;
 /**
  * Get the MessageSource class file.
  */
+use Exception;
+
 require_once(dirname(__FILE__).'/MessageSource.php');
 
 /**
diff --git a/framework/I18N/core/MessageSource_XLIFF.php b/framework/I18N/core/MessageSource_XLIFF.php
index 2a2353ea..601fd9a0 100644
--- a/framework/I18N/core/MessageSource_XLIFF.php
+++ b/framework/I18N/core/MessageSource_XLIFF.php
@@ -21,6 +21,11 @@ namespace Prado\I18N\core;
 /**
  * Get the MessageSource class file.
  */
+use DOMDocument;
+use DOMXPath;
+use Prado\Exceptions\TException;
+use Prado\Exceptions\TIOException;
+
 require_once(dirname(__FILE__).'/MessageSource.php');
 
 /**
diff --git a/framework/I18N/core/MessageSource_gettext.php b/framework/I18N/core/MessageSource_gettext.php
index 9c7167cb..0033619c 100644
--- a/framework/I18N/core/MessageSource_gettext.php
+++ b/framework/I18N/core/MessageSource_gettext.php
@@ -21,6 +21,10 @@ namespace Prado\I18N\core;
 /**
  * Get the MessageSource class file.
  */
+use Prado\Exceptions\TException;
+use Prado\Exceptions\TIOException;
+use Prado\I18N\core\Gettext\TGettext;
+
 require_once(dirname(__FILE__).'/MessageSource.php');
 
 /**
diff --git a/framework/I18N/core/NumberFormatInfo.php b/framework/I18N/core/NumberFormatInfo.php
index c48f6e6b..c25e3d6f 100644
--- a/framework/I18N/core/NumberFormatInfo.php
+++ b/framework/I18N/core/NumberFormatInfo.php
@@ -21,6 +21,8 @@ namespace Prado\I18N\core;
 /**
  * Get the CultureInfo class file.
  */
+use Exception;
+
 require_once(dirname(__FILE__).'/CultureInfo.php');
 
 /**
diff --git a/framework/I18N/core/TCache_Lite.php b/framework/I18N/core/TCache_Lite.php
index eaffd9ee..bb06748c 100644
--- a/framework/I18N/core/TCache_Lite.php
+++ b/framework/I18N/core/TCache_Lite.php
@@ -17,6 +17,7 @@
  */
 
 namespace Prado\I18N\core;
+use Exception;
 
 /**
 * Fast, light and safe Cache Class
diff --git a/framework/I18N/core/TMessageSourceIOException.php b/framework/I18N/core/TMessageSourceIOException.php
index 70fa718e..ce9e086a 100644
--- a/framework/I18N/core/TMessageSourceIOException.php
+++ b/framework/I18N/core/TMessageSourceIOException.php
@@ -16,6 +16,7 @@
  */
 
 namespace Prado\I18N\core;
+use Prado\Exceptions\TException;
 
 /**
  * TMessageSourceIOException thrown when unable to modify message source
diff --git a/framework/Security/TDbUser.php b/framework/Security/TDbUser.php
index fec4795c..417e8942 100644
--- a/framework/Security/TDbUser.php
+++ b/framework/Security/TDbUser.php
@@ -11,6 +11,7 @@
 
 namespace Prado\Security;
 use Prado\Data\TDbConnection;
+use Prado\Exceptions\TConfigurationException;
 
 /**
  * TDbUser class
diff --git a/framework/Security/TUserManager.php b/framework/Security/TUserManager.php
index 1b72c44e..3bc266db 100644
--- a/framework/Security/TUserManager.php
+++ b/framework/Security/TUserManager.php
@@ -12,6 +12,7 @@
 namespace Prado\Security;
 use Prado\Exceptions\TConfigurationException;
 use Prado\Exceptions\TInvalidOperationException;
+use Prado\Prado;
 use Prado\TApplication;
 use Prado\TPropertyValue;
 use Prado\Xml\TXmlDocument;
diff --git a/framework/TApplication.php b/framework/TApplication.php
index 286a6895..2f86a7fa 100644
--- a/framework/TApplication.php
+++ b/framework/TApplication.php
@@ -13,6 +13,7 @@ namespace Prado;
 use Prado\Exceptions\TErrorHandler;
 use Prado\Exceptions\THttpException;
 use Prado\Exceptions\TConfigurationException;
+use Prado\I18N\TGlobalization;
 use Prado\Security\TSecurityManager;
 use Prado\Web\TAssetManager;
 use Prado\Web\THttpRequest;
diff --git a/framework/TComponent.php b/framework/TComponent.php
index 136f4343..447f695e 100644
--- a/framework/TComponent.php
+++ b/framework/TComponent.php
@@ -14,6 +14,7 @@
  */
 
 namespace Prado;
+use Prado\Util\IBaseBehavior;
 use Prado\Web\Javascripts\TJavaScriptLiteral;
 use Prado\Web\Javascripts\TJavaScriptString;
 use Prado\Util\TCallChain;
diff --git a/framework/Util/TBrowserLogRoute.php b/framework/Util/TBrowserLogRoute.php
index 7c32de3c..154cab64 100644
--- a/framework/Util/TBrowserLogRoute.php
+++ b/framework/Util/TBrowserLogRoute.php
@@ -10,6 +10,8 @@
  */
 
 namespace Prado\Util;
+use Prado\TPropertyValue;
+use Prado\Web\THttpUtility;
 
 /**
  * TBrowserLogRoute class.
diff --git a/framework/Util/TCallChain.php b/framework/Util/TCallChain.php
index 03ce60c0..644658da 100644
--- a/framework/Util/TCallChain.php
+++ b/framework/Util/TCallChain.php
@@ -9,6 +9,8 @@
  */
 
 namespace Prado\Util;
+use Prado\Collections\TList;
+use Prado\Collections\TListIterator;
 
 /**
  * TCallChain is a recursive event calling mechanism.  This class implements
diff --git a/framework/Util/TDataFieldAccessor.php b/framework/Util/TDataFieldAccessor.php
index 10bb678e..57145f46 100644
--- a/framework/Util/TDataFieldAccessor.php
+++ b/framework/Util/TDataFieldAccessor.php
@@ -10,6 +10,8 @@
  */
 
 namespace Prado\Util;
+use Exception;
+use Prado\Exceptions\TInvalidDataValueException;
 
 /**
  * TDataFieldAccessor class
diff --git a/framework/Util/TDateTimeStamp.php b/framework/Util/TDateTimeStamp.php
index d6ad628d..edda4b9c 100644
--- a/framework/Util/TDateTimeStamp.php
+++ b/framework/Util/TDateTimeStamp.php
@@ -10,6 +10,8 @@
  */
 
 namespace Prado\Util;
+use DateTime;
+use DateTimeZone;
 
 /**
  * TDateTimeStamp Class
diff --git a/framework/Util/TDbLogRoute.php b/framework/Util/TDbLogRoute.php
index f78aec88..5cf46fae 100644
--- a/framework/Util/TDbLogRoute.php
+++ b/framework/Util/TDbLogRoute.php
@@ -10,6 +10,11 @@
  */
 
 namespace Prado\Util;
+use Exception;
+use Prado\Data\TDataSourceConfig;
+use Prado\Data\TDbConnection;
+use Prado\Exceptions\TConfigurationException;
+use Prado\TPropertyValue;
 
 /**
  * TDbLogRoute class
diff --git a/framework/Util/TEmailLogRoute.php b/framework/Util/TEmailLogRoute.php
index 64c05ef6..15ce666e 100644
--- a/framework/Util/TEmailLogRoute.php
+++ b/framework/Util/TEmailLogRoute.php
@@ -23,6 +23,8 @@ namespace Prado\Util;
  * @package Prado\Util
  * @since 3.0
  */
+use Prado\Exceptions\TConfigurationException;
+
 /**
  * TEmailLogRoute class.
  *
diff --git a/framework/Util/TFileLogRoute.php b/framework/Util/TFileLogRoute.php
index 19fcd9b4..d7f309ee 100644
--- a/framework/Util/TFileLogRoute.php
+++ b/framework/Util/TFileLogRoute.php
@@ -10,6 +10,10 @@
  */
 
 namespace Prado\Util;
+use Prado\Exceptions\TConfigurationException;
+use Prado\Exceptions\TInvalidDataValueException;
+use Prado\Prado;
+use Prado\TPropertyValue;
 
 /**
  * TFileLogRoute class.
diff --git a/framework/Util/TFirePhpLogRoute.php b/framework/Util/TFirePhpLogRoute.php
index 81ec2ede..debab321 100644
--- a/framework/Util/TFirePhpLogRoute.php
+++ b/framework/Util/TFirePhpLogRoute.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Util;
+use Prado\Prado;
 
 /**
  * TFirePhpLogRoute class.
diff --git a/framework/Util/TLogRouter.php b/framework/Util/TLogRouter.php
index 2b2106f1..d5847d61 100644
--- a/framework/Util/TLogRouter.php
+++ b/framework/Util/TLogRouter.php
@@ -11,6 +11,12 @@
 
 namespace Prado\Util;
 
+use Prado\Exceptions\TConfigurationException;
+use Prado\Exceptions\TInvalidDataTypeException;
+use Prado\Prado;
+use Prado\TApplication;
+use Prado\Xml\TXmlDocument;
+
 Prado::using('System.Data.TDbConnection');
 
 /**
diff --git a/framework/Util/TLogger.php b/framework/Util/TLogger.php
index 556e8a73..17427fe7 100644
--- a/framework/Util/TLogger.php
+++ b/framework/Util/TLogger.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Util;
+use Prado\Web\UI\TControl;
 
 /**
  * TLogger class.
diff --git a/framework/Util/TParameterModule.php b/framework/Util/TParameterModule.php
index 4cb26c7d..896aa3f9 100644
--- a/framework/Util/TParameterModule.php
+++ b/framework/Util/TParameterModule.php
@@ -10,6 +10,13 @@
  */
 
 namespace Prado\Util;
+use Prado\Caching\TFileCacheDependency;
+use Prado\Exceptions\TConfigurationException;
+use Prado\Exceptions\TInvalidOperationException;
+use Prado\Prado;
+use Prado\TApplication;
+use Prado\Xml\TXmlDocument;
+use Prado\Xml\TXmlElement;
 
 /**
  * TParameterModule class
diff --git a/framework/Util/TRpcClient.php b/framework/Util/TRpcClient.php
index 15d29955..73b7638d 100644
--- a/framework/Util/TRpcClient.php
+++ b/framework/Util/TRpcClient.php
@@ -9,6 +9,8 @@
  */
 
 namespace Prado\Util;
+use Prado\Exceptions\TApplicationException;
+use Prado\TPropertyValue;
 
 /**
  * TRpcClient class
diff --git a/framework/Util/TRpcClientRequestException.php b/framework/Util/TRpcClientRequestException.php
index 0c18e8ad..42a7eb9d 100644
--- a/framework/Util/TRpcClientRequestException.php
+++ b/framework/Util/TRpcClientRequestException.php
@@ -9,6 +9,7 @@
  */
 
 namespace Prado\Util;
+use Prado\Exceptions\TApplicationException;
 
 /**
  * TRpcClientRequestException class
diff --git a/framework/Util/TRpcClientResponseException.php b/framework/Util/TRpcClientResponseException.php
index afc4116d..7139f010 100644
--- a/framework/Util/TRpcClientResponseException.php
+++ b/framework/Util/TRpcClientResponseException.php
@@ -9,6 +9,7 @@
  */
 
 namespace Prado\Util;
+use Prado\Exceptions\TApplicationException;
 
 /**
  * TRpcClientResponseException class
diff --git a/framework/Util/TSimpleDateFormatter.php b/framework/Util/TSimpleDateFormatter.php
index 5577e0e5..448c5aa7 100644
--- a/framework/Util/TSimpleDateFormatter.php
+++ b/framework/Util/TSimpleDateFormatter.php
@@ -10,6 +10,8 @@
  */
 
 namespace Prado\Util;
+use Prado\Exceptions\TInvalidDataValueException;
+use Prado\Prado;
 
 /**
  * TSimpleDateFormatter class.
diff --git a/framework/Web/Services/TFeedService.php b/framework/Web/Services/TFeedService.php
index 7b2ece8b..b3c880c9 100644
--- a/framework/Web/Services/TFeedService.php
+++ b/framework/Web/Services/TFeedService.php
@@ -11,6 +11,7 @@
  */
 
 namespace Prado\Web\Services;
+use Prado\Prado;
 use Prado\TApplication;
 use Prado\Exceptions\TConfigurationException;
 use Prado\Exceptions\THttpException;
diff --git a/framework/Web/Services/TPageConfiguration.php b/framework/Web/Services/TPageConfiguration.php
index 681af133..a648a8ec 100644
--- a/framework/Web/Services/TPageConfiguration.php
+++ b/framework/Web/Services/TPageConfiguration.php
@@ -12,6 +12,7 @@
 namespace Prado\Web\Services;
 use Prado\Exceptions\TConfigurationException;
 use Prado\Prado;
+use Prado\Security\TAuthorizationRule;
 use Prado\TApplicationConfiguration;
 use Prado\Security\TAuthorizationRuleCollection;
 use Prado\TApplication;
diff --git a/framework/Web/Services/TRpcException.php b/framework/Web/Services/TRpcException.php
index baa28d46..7228915a 100644
--- a/framework/Web/Services/TRpcException.php
+++ b/framework/Web/Services/TRpcException.php
@@ -9,6 +9,7 @@
  */
 
 namespace Prado\Web\Services;
+use Prado\Exceptions\TException;
 
 /**
  * TRpcException class
diff --git a/framework/Web/Services/TSoapServer.php b/framework/Web/Services/TSoapServer.php
index f737ae20..9e884a26 100644
--- a/framework/Web/Services/TSoapServer.php
+++ b/framework/Web/Services/TSoapServer.php
@@ -15,6 +15,7 @@ use Prado\Exceptions\TInvalidDataValueException;
 use Prado\TPropertyValue;
 use Prado\Prado;
 use Prado\TApplicationMode;
+use WsdlGenerator;
 
 /**
  * TSoapServer class.
diff --git a/framework/Web/Services/TSoapService.php b/framework/Web/Services/TSoapService.php
index 5760f63c..265d2bb7 100644
--- a/framework/Web/Services/TSoapService.php
+++ b/framework/Web/Services/TSoapService.php
@@ -11,6 +11,7 @@
  */
 
 namespace Prado\Web\Services;
+use Prado\Exceptions\TConfigurationException;
 use Prado\Exceptions\THttpException;
 use Prado\Prado;
 use Prado\TApplication;
diff --git a/framework/Web/TAssetManager.php b/framework/Web/TAssetManager.php
index d6bcab6d..0827c265 100644
--- a/framework/Web/TAssetManager.php
+++ b/framework/Web/TAssetManager.php
@@ -13,9 +13,9 @@ namespace Prado\Web;
 use Prado\Exceptions\TConfigurationException;
 use Prado\Exceptions\TInvalidDataValueException;
 use Prado\Exceptions\TInvalidOperationException;
+use Prado\Exceptions\TIOException;
 use Prado\Prado;
 use Prado\TApplicationMode;
-use Prado\IO\TIOException;
 use Prado\IO\TTarFileExtractor;
 
 /**
diff --git a/framework/Web/TCacheHttpSession.php b/framework/Web/TCacheHttpSession.php
index 56c3ff61..bf942246 100644
--- a/framework/Web/TCacheHttpSession.php
+++ b/framework/Web/TCacheHttpSession.php
@@ -12,6 +12,7 @@
  */
 
 namespace Prado\Web;
+use Prado\Caching\ICache;
 use Prado\Exceptions\TConfigurationException;
 
 /**
diff --git a/framework/Web/TUrlMapping.php b/framework/Web/TUrlMapping.php
index d8c0aed7..278e459f 100644
--- a/framework/Web/TUrlMapping.php
+++ b/framework/Web/TUrlMapping.php
@@ -13,6 +13,7 @@ namespace Prado\Web;
 use Prado\Exceptions\TConfigurationException;
 use Prado\Prado;
 use Prado\TApplication;
+use Prado\TPropertyValue;
 use Prado\Xml\TXmlDocument;
 use Prado\Xml\TXmlElement;
 
diff --git a/framework/Web/TUrlMappingPattern.php b/framework/Web/TUrlMappingPattern.php
index e32a9130..3d370940 100644
--- a/framework/Web/TUrlMappingPattern.php
+++ b/framework/Web/TUrlMappingPattern.php
@@ -13,6 +13,7 @@ namespace Prado\Web;
 use Prado\Collections\TAttributeCollection;
 use Prado\Exceptions\TConfigurationException;
 use Prado\Exceptions\TInvalidDataValueException;
+use Prado\Prado;
 use Prado\TPropertyValue;
 
 /**
diff --git a/framework/Web/UI/ActiveControls/TActiveBoundColumn.php b/framework/Web/UI/ActiveControls/TActiveBoundColumn.php
index 38b6fdbf..e4aaa4ed 100644
--- a/framework/Web/UI/ActiveControls/TActiveBoundColumn.php
+++ b/framework/Web/UI/ActiveControls/TActiveBoundColumn.php
@@ -10,6 +10,10 @@
  */
 
 namespace Prado\Web\UI\ActiveControls;
+use Prado\Prado;
+use Prado\Web\UI\WebControls\IItemDataRenderer;
+use Prado\Web\UI\WebControls\TBoundColumn;
+use Prado\Web\UI\WebControls\TDataGrid;
 
 /**
  * TActiveBoundColumn class
diff --git a/framework/Web/UI/ActiveControls/TActiveButton.php b/framework/Web/UI/ActiveControls/TActiveButton.php
index 66d7b022..7b3f48ec 100644
--- a/framework/Web/UI/ActiveControls/TActiveButton.php
+++ b/framework/Web/UI/ActiveControls/TActiveButton.php
@@ -14,6 +14,9 @@ namespace Prado\Web\UI\ActiveControls;
 /**
  * Load active control adapter.
  */
+use Prado\Prado;
+use Prado\Web\UI\WebControls\TButton;
+
 Prado::using('System.Web.UI.ActiveControls.TActiveControlAdapter');
 
 /**
diff --git a/framework/Web/UI/ActiveControls/TActiveButtonColumn.php b/framework/Web/UI/ActiveControls/TActiveButtonColumn.php
index cee7c86e..32a2ca78 100644
--- a/framework/Web/UI/ActiveControls/TActiveButtonColumn.php
+++ b/framework/Web/UI/ActiveControls/TActiveButtonColumn.php
@@ -10,6 +10,9 @@
  */
 
 namespace Prado\Web\UI\ActiveControls;
+use Prado\Web\UI\WebControls\TButtonColumn;
+use Prado\Web\UI\WebControls\TButtonColumnType;
+use Prado\Web\UI\WebControls\TListItemType;
 
 /**
  * TActiveButtonColumn class
diff --git a/framework/Web/UI/ActiveControls/TActiveCheckBox.php b/framework/Web/UI/ActiveControls/TActiveCheckBox.php
index accfc5a1..80719ec9 100644
--- a/framework/Web/UI/ActiveControls/TActiveCheckBox.php
+++ b/framework/Web/UI/ActiveControls/TActiveCheckBox.php
@@ -14,6 +14,10 @@ namespace Prado\Web\UI\ActiveControls;
 /**
  * Load active control adapter.
  */
+use Prado\Prado;
+use Prado\TPropertyValue;
+use Prado\Web\UI\WebControls\TCheckBox;
+
 Prado::using('System.Web.UI.ActiveControls.TActiveControlAdapter');
 
 /**
diff --git a/framework/Web/UI/ActiveControls/TActiveCheckBoxColumn.php b/framework/Web/UI/ActiveControls/TActiveCheckBoxColumn.php
index 2fa4f4be..1ff5d1f8 100644
--- a/framework/Web/UI/ActiveControls/TActiveCheckBoxColumn.php
+++ b/framework/Web/UI/ActiveControls/TActiveCheckBoxColumn.php
@@ -10,6 +10,11 @@
  */
 
 namespace Prado\Web\UI\ActiveControls;
+use Prado\Prado;
+use Prado\Web\UI\WebControls\IItemDataRenderer;
+use Prado\Web\UI\WebControls\TCheckBoxColumn;
+use Prado\Web\UI\WebControls\TDataGrid;
+use Prado\Web\UI\WebControls\TListItemType;
 
 /**
  * TActiveCheckBoxColumn class
diff --git a/framework/Web/UI/ActiveControls/TActiveCheckBoxList.php b/framework/Web/UI/ActiveControls/TActiveCheckBoxList.php
index 8d2c71ae..f490f737 100644
--- a/framework/Web/UI/ActiveControls/TActiveCheckBoxList.php
+++ b/framework/Web/UI/ActiveControls/TActiveCheckBoxList.php
@@ -14,6 +14,9 @@ namespace Prado\Web\UI\ActiveControls;
 /**
  * Load active control adapter.
  */
+use Prado\Prado;
+use Prado\Web\UI\WebControls\TCheckBoxList;
+
 Prado::using('System.Web.UI.ActiveControls.TActiveListControlAdapter');
 
 /**
diff --git a/framework/Web/UI/ActiveControls/TActiveCheckBoxListItem.php b/framework/Web/UI/ActiveControls/TActiveCheckBoxListItem.php
index cfe25c69..5f6245e9 100644
--- a/framework/Web/UI/ActiveControls/TActiveCheckBoxListItem.php
+++ b/framework/Web/UI/ActiveControls/TActiveCheckBoxListItem.php
@@ -11,6 +11,8 @@
 
 namespace Prado\Web\UI\ActiveControls;
 
+use Prado\Web\UI\WebControls\TCheckBox;
+
 class TActiveCheckBoxListItem extends TActiveCheckBox
 {
 	/**
diff --git a/framework/Web/UI/ActiveControls/TActiveClientScript.php b/framework/Web/UI/ActiveControls/TActiveClientScript.php
index f933b2f1..40bef4aa 100755
--- a/framework/Web/UI/ActiveControls/TActiveClientScript.php
+++ b/framework/Web/UI/ActiveControls/TActiveClientScript.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\ActiveControls;
+use Prado\Web\UI\WebControls\TClientScript;
 
 /**
  * TActiveClientScript class
diff --git a/framework/Web/UI/ActiveControls/TActiveControlAdapter.php b/framework/Web/UI/ActiveControls/TActiveControlAdapter.php
index 685a3688..3c13cc2f 100644
--- a/framework/Web/UI/ActiveControls/TActiveControlAdapter.php
+++ b/framework/Web/UI/ActiveControls/TActiveControlAdapter.php
@@ -14,6 +14,9 @@ namespace Prado\Web\UI\ActiveControls;
 /*
  * Load common active control options.
  */
+use Prado\Prado;
+use Prado\Web\UI\TControlAdapter;
+
 Prado::using('System.Web.UI.ActiveControls.TBaseActiveControl');
 
 /**
diff --git a/framework/Web/UI/ActiveControls/TActiveCustomValidator.php b/framework/Web/UI/ActiveControls/TActiveCustomValidator.php
index 3ff7478b..acddd275 100644
--- a/framework/Web/UI/ActiveControls/TActiveCustomValidator.php
+++ b/framework/Web/UI/ActiveControls/TActiveCustomValidator.php
@@ -11,6 +11,11 @@
 
 namespace Prado\Web\UI\ActiveControls;
 
+use Prado\Exceptions\TNotSupportedException;
+use Prado\Prado;
+use Prado\Web\UI\WebControls\TBaseValidator;
+use Prado\Web\UI\WebControls\TCustomValidator;
+
 Prado::using('System.Web.UI.ActiveControls.TCallbackClientSide');
 
 /**
diff --git a/framework/Web/UI/ActiveControls/TActiveCustomValidatorClientSide.php b/framework/Web/UI/ActiveControls/TActiveCustomValidatorClientSide.php
index 3dcf1b45..c43c939a 100644
--- a/framework/Web/UI/ActiveControls/TActiveCustomValidatorClientSide.php
+++ b/framework/Web/UI/ActiveControls/TActiveCustomValidatorClientSide.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\ActiveControls;
+use Prado\TPropertyValue;
 
 /**
  * Custom Validator callback client side options class.
diff --git a/framework/Web/UI/ActiveControls/TActiveDataGrid.php b/framework/Web/UI/ActiveControls/TActiveDataGrid.php
index 63ebe8de..574afed8 100644
--- a/framework/Web/UI/ActiveControls/TActiveDataGrid.php
+++ b/framework/Web/UI/ActiveControls/TActiveDataGrid.php
@@ -14,6 +14,12 @@ namespace Prado\Web\UI\ActiveControls;
 /**
  * Includes the following used classes
  */
+use Prado\Prado;
+use Prado\Web\UI\ISurroundable;
+use Prado\Web\UI\WebControls\TDataGrid;
+use Prado\Web\UI\WebControls\TDataGridPagerButtonType;
+use Prado\Web\UI\WebControls\TLabel;
+
 Prado::using('System.Web.UI.ActiveControls.TActiveControlAdapter');
 Prado::using('System.Web.UI.ActiveControls.TActiveLinkButton');
 Prado::using('System.Web.UI.ActiveControls.TActiveImageButton');
diff --git a/framework/Web/UI/ActiveControls/TActiveDataGridPager.php b/framework/Web/UI/ActiveControls/TActiveDataGridPager.php
index c3aafe67..5e9f8e94 100644
--- a/framework/Web/UI/ActiveControls/TActiveDataGridPager.php
+++ b/framework/Web/UI/ActiveControls/TActiveDataGridPager.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\ActiveControls;
+use Prado\Web\UI\WebControls\TDataGridPager;
 
 /**
  * TActiveDataGridPager class.
diff --git a/framework/Web/UI/ActiveControls/TActiveDataGridPagerEventParameter.php b/framework/Web/UI/ActiveControls/TActiveDataGridPagerEventParameter.php
index e9e7fc7a..a6e192e7 100644
--- a/framework/Web/UI/ActiveControls/TActiveDataGridPagerEventParameter.php
+++ b/framework/Web/UI/ActiveControls/TActiveDataGridPagerEventParameter.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\ActiveControls;
+use Prado\Web\UI\WebControls\TDataGridPagerEventParameter;
 
 /**
  * TActiveDataGridPagerEventParameter class
diff --git a/framework/Web/UI/ActiveControls/TActiveDataList.php b/framework/Web/UI/ActiveControls/TActiveDataList.php
index c352eb11..d46e4c74 100644
--- a/framework/Web/UI/ActiveControls/TActiveDataList.php
+++ b/framework/Web/UI/ActiveControls/TActiveDataList.php
@@ -9,6 +9,7 @@
  */
 
 namespace Prado\Web\UI\ActiveControls;
+use Prado\Web\UI\WebControls\TDataList;
 
 /**
  * TActiveDataList class
diff --git a/framework/Web/UI/ActiveControls/TActiveDatePicker.php b/framework/Web/UI/ActiveControls/TActiveDatePicker.php
index 61f769ba..18169f57 100755
--- a/framework/Web/UI/ActiveControls/TActiveDatePicker.php
+++ b/framework/Web/UI/ActiveControls/TActiveDatePicker.php
@@ -15,6 +15,13 @@ namespace Prado\Web\UI\ActiveControls;
 /**
  * Load active control adapter.
  */
+use Prado\Prado;
+use Prado\TPropertyValue;
+use Prado\Web\Javascripts\TJavaScript;
+use Prado\Web\UI\TControl;
+use Prado\Web\UI\WebControls\TDatePicker;
+use Prado\Web\UI\WebControls\TDatePickerInputMode;
+
 Prado::using('System.Web.UI.ActiveControls.TActiveControlAdapter');
 
 /**
diff --git a/framework/Web/UI/ActiveControls/TActiveDropDownList.php b/framework/Web/UI/ActiveControls/TActiveDropDownList.php
index 88b0172f..083b8290 100644
--- a/framework/Web/UI/ActiveControls/TActiveDropDownList.php
+++ b/framework/Web/UI/ActiveControls/TActiveDropDownList.php
@@ -14,6 +14,9 @@ namespace Prado\Web\UI\ActiveControls;
 /**
  * Load active list control adapter
  */
+use Prado\Prado;
+use Prado\Web\UI\WebControls\TDropDownList;
+
 Prado::using('System.Web.UI.ActiveControls.TActiveListControlAdapter');
 
 /**
diff --git a/framework/Web/UI/ActiveControls/TActiveDropDownListColumn.php b/framework/Web/UI/ActiveControls/TActiveDropDownListColumn.php
index 530500e2..29d1b993 100644
--- a/framework/Web/UI/ActiveControls/TActiveDropDownListColumn.php
+++ b/framework/Web/UI/ActiveControls/TActiveDropDownListColumn.php
@@ -10,6 +10,10 @@
  */
 
 namespace Prado\Web\UI\ActiveControls;
+use Prado\Prado;
+use Prado\Web\UI\WebControls\IItemDataRenderer;
+use Prado\Web\UI\WebControls\TDataGrid;
+use Prado\Web\UI\WebControls\TDropDownListColumn;
 
 /**
  * TActiveDropDownListColumn class
diff --git a/framework/Web/UI/ActiveControls/TActiveEditCommandColumn.php b/framework/Web/UI/ActiveControls/TActiveEditCommandColumn.php
index ef1f886d..60d5ab29 100644
--- a/framework/Web/UI/ActiveControls/TActiveEditCommandColumn.php
+++ b/framework/Web/UI/ActiveControls/TActiveEditCommandColumn.php
@@ -10,6 +10,9 @@
  */
 
 namespace Prado\Web\UI\ActiveControls;
+use Prado\Prado;
+use Prado\Web\UI\WebControls\TButtonColumnType;
+use Prado\Web\UI\WebControls\TEditCommandColumn;
 
 /**
  * TActiveEditCommandColumn class
diff --git a/framework/Web/UI/ActiveControls/TActiveFileUpload.php b/framework/Web/UI/ActiveControls/TActiveFileUpload.php
index 1e837643..21bddf85 100755
--- a/framework/Web/UI/ActiveControls/TActiveFileUpload.php
+++ b/framework/Web/UI/ActiveControls/TActiveFileUpload.php
@@ -13,6 +13,13 @@ namespace Prado\Web\UI\ActiveControls;
 /**
  * Load TActiveControlAdapter and TFileUpload.
  */
+use Exception;
+use Prado\Exceptions\TInvalidDataValueException;
+use Prado\Prado;
+use Prado\TPropertyValue;
+use Prado\Web\UI\INamingContainer;
+use Prado\Web\UI\WebControls\TFileUpload;
+
 Prado::using('System.Web.UI.ActiveControls.TActiveControlAdapter');
 Prado::using('System.Web.UI.WebControls.TFileUpload');
 
diff --git a/framework/Web/UI/ActiveControls/TActiveHiddenField.php b/framework/Web/UI/ActiveControls/TActiveHiddenField.php
index 7dda44d0..6bed13ce 100644
--- a/framework/Web/UI/ActiveControls/TActiveHiddenField.php
+++ b/framework/Web/UI/ActiveControls/TActiveHiddenField.php
@@ -11,6 +11,9 @@
 
 namespace Prado\Web\UI\ActiveControls;
 
+use Prado\Prado;
+use Prado\Web\UI\WebControls\THiddenField;
+
 Prado::using('System.Web.UI.ActiveControls.TActiveControlAdapter');
 
 /**
diff --git a/framework/Web/UI/ActiveControls/TActiveHyperLink.php b/framework/Web/UI/ActiveControls/TActiveHyperLink.php
index d625cf24..53a3150d 100644
--- a/framework/Web/UI/ActiveControls/TActiveHyperLink.php
+++ b/framework/Web/UI/ActiveControls/TActiveHyperLink.php
@@ -10,6 +10,9 @@
  */
 
 namespace Prado\Web\UI\ActiveControls;
+use Prado\IO\TTextWriter;
+use Prado\Prado;
+use Prado\Web\UI\WebControls\THyperLink;
 
 /**
  * TActiveHyperLink class.
diff --git a/framework/Web/UI/ActiveControls/TActiveHyperLinkColumn.php b/framework/Web/UI/ActiveControls/TActiveHyperLinkColumn.php
index 1d2d103c..54be2c24 100644
--- a/framework/Web/UI/ActiveControls/TActiveHyperLinkColumn.php
+++ b/framework/Web/UI/ActiveControls/TActiveHyperLinkColumn.php
@@ -10,6 +10,10 @@
  */
 
 namespace Prado\Web\UI\ActiveControls;
+use Prado\Prado;
+use Prado\Web\UI\WebControls\IItemDataRenderer;
+use Prado\Web\UI\WebControls\TDataGrid;
+use Prado\Web\UI\WebControls\THyperLinkColumn;
 
 /**
  * TActiveHyperLinkColumn class
diff --git a/framework/Web/UI/ActiveControls/TActiveImage.php b/framework/Web/UI/ActiveControls/TActiveImage.php
index 3c2d0172..3ea0a1ca 100644
--- a/framework/Web/UI/ActiveControls/TActiveImage.php
+++ b/framework/Web/UI/ActiveControls/TActiveImage.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\ActiveControls;
+use Prado\Web\UI\WebControls\TImage;
 
 /**
  * TActiveImage class.
diff --git a/framework/Web/UI/ActiveControls/TActiveImageButton.php b/framework/Web/UI/ActiveControls/TActiveImageButton.php
index df4dacb3..95106525 100644
--- a/framework/Web/UI/ActiveControls/TActiveImageButton.php
+++ b/framework/Web/UI/ActiveControls/TActiveImageButton.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\ActiveControls;
+use Prado\Web\UI\WebControls\TImageButton;
 
 /**
  * TActiveImageButton class.
diff --git a/framework/Web/UI/ActiveControls/TActiveLabel.php b/framework/Web/UI/ActiveControls/TActiveLabel.php
index 8ef99a47..ecfd9e9f 100644
--- a/framework/Web/UI/ActiveControls/TActiveLabel.php
+++ b/framework/Web/UI/ActiveControls/TActiveLabel.php
@@ -14,6 +14,9 @@ namespace Prado\Web\UI\ActiveControls;
 /**
  * Load active control adapter.
  */
+use Prado\Prado;
+use Prado\Web\UI\WebControls\TLabel;
+
 Prado::using('System.Web.UI.ActiveControls.TActiveControlAdapter');
 
 /**
diff --git a/framework/Web/UI/ActiveControls/TActiveLinkButton.php b/framework/Web/UI/ActiveControls/TActiveLinkButton.php
index a5af0b39..c8e0c889 100644
--- a/framework/Web/UI/ActiveControls/TActiveLinkButton.php
+++ b/framework/Web/UI/ActiveControls/TActiveLinkButton.php
@@ -14,6 +14,9 @@ namespace Prado\Web\UI\ActiveControls;
 /**
  * Load active control adapter.
  */
+use Prado\Prado;
+use Prado\Web\UI\WebControls\TLinkButton;
+
 Prado::using('System.Web.UI.ActiveControls.TActiveControlAdapter');
 
 /**
diff --git a/framework/Web/UI/ActiveControls/TActiveListBox.php b/framework/Web/UI/ActiveControls/TActiveListBox.php
index 16ef4e4f..3b407d35 100644
--- a/framework/Web/UI/ActiveControls/TActiveListBox.php
+++ b/framework/Web/UI/ActiveControls/TActiveListBox.php
@@ -11,6 +11,10 @@
 
 namespace Prado\Web\UI\ActiveControls;
 
+
+use Prado\Prado;
+use Prado\Web\UI\WebControls\TListBox;
+
 /**
  * Load active list control adapter
  */
diff --git a/framework/Web/UI/ActiveControls/TActiveListControlAdapter.php b/framework/Web/UI/ActiveControls/TActiveListControlAdapter.php
index 30e4385e..4c6d9ff7 100644
--- a/framework/Web/UI/ActiveControls/TActiveListControlAdapter.php
+++ b/framework/Web/UI/ActiveControls/TActiveListControlAdapter.php
@@ -14,6 +14,9 @@ namespace Prado\Web\UI\ActiveControls;
 /**
  * Load active control adapter.
  */
+use Prado\Prado;
+use Prado\Web\UI\WebControls\IListControlAdapter;
+
 Prado::using('System.Web.UI.ActiveControls.TActiveControlAdapter');
 Prado::using('System.Web.UI.WebControls.TListControl');
 
diff --git a/framework/Web/UI/ActiveControls/TActiveListItemCollection.php b/framework/Web/UI/ActiveControls/TActiveListItemCollection.php
index 516599c2..6d18dc29 100644
--- a/framework/Web/UI/ActiveControls/TActiveListItemCollection.php
+++ b/framework/Web/UI/ActiveControls/TActiveListItemCollection.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\ActiveControls;
+use Prado\Collections\TListItemCollection;
 
 /**
  * TActiveListItemCollection class.
diff --git a/framework/Web/UI/ActiveControls/TActiveLiteralColumn.php b/framework/Web/UI/ActiveControls/TActiveLiteralColumn.php
index 59e1b366..a09fa118 100644
--- a/framework/Web/UI/ActiveControls/TActiveLiteralColumn.php
+++ b/framework/Web/UI/ActiveControls/TActiveLiteralColumn.php
@@ -10,6 +10,10 @@
  */
 
 namespace Prado\Web\UI\ActiveControls;
+use Prado\Prado;
+use Prado\Web\UI\WebControls\IItemDataRenderer;
+use Prado\Web\UI\WebControls\TDataGrid;
+use Prado\Web\UI\WebControls\TLiteralColumn;
 
 /**
  * TActiveLiteralColumn class
diff --git a/framework/Web/UI/ActiveControls/TActiveMultiView.php b/framework/Web/UI/ActiveControls/TActiveMultiView.php
index 488796a1..8553b449 100644
--- a/framework/Web/UI/ActiveControls/TActiveMultiView.php
+++ b/framework/Web/UI/ActiveControls/TActiveMultiView.php
@@ -14,6 +14,9 @@ namespace Prado\Web\UI\ActiveControls;
 /**
  * Includes the following used classes
  */
+use Prado\Prado;
+use Prado\Web\UI\WebControls\TMultiView;
+
 Prado::using('System.Web.UI.WebControls.TMultiView');
 
 /**
diff --git a/framework/Web/UI/ActiveControls/TActivePageAdapter.php b/framework/Web/UI/ActiveControls/TActivePageAdapter.php
index 0b038360..c579858b 100644
--- a/framework/Web/UI/ActiveControls/TActivePageAdapter.php
+++ b/framework/Web/UI/ActiveControls/TActivePageAdapter.php
@@ -15,6 +15,12 @@ namespace Prado\Web\UI\ActiveControls;
 /**
  * Load callback response adapter class.
  */
+use Prado\Prado;
+use Prado\Web\Javascripts\TJavaScript;
+use Prado\Web\UI\TControl;
+use Prado\Web\UI\TControlAdapter;
+use Prado\Web\UI\TPage;
+
 Prado::using('System.Web.UI.ActiveControls.TCallbackResponseAdapter');
 Prado::using('System.Web.UI.ActiveControls.TCallbackClientScript');
 Prado::using('System.Web.UI.ActiveControls.TCallbackEventParameter');
diff --git a/framework/Web/UI/ActiveControls/TActivePager.php b/framework/Web/UI/ActiveControls/TActivePager.php
index 119e3d9b..7a15ad42 100644
--- a/framework/Web/UI/ActiveControls/TActivePager.php
+++ b/framework/Web/UI/ActiveControls/TActivePager.php
@@ -14,6 +14,14 @@ namespace Prado\Web\UI\ActiveControls;
 /**
  * Load active control adapter.
  */
+use Prado\Prado;
+use Prado\Web\UI\WebControls\TDisplayStyle;
+use Prado\Web\UI\WebControls\TLabel;
+use Prado\Web\UI\WebControls\TPager;
+use Prado\Web\UI\WebControls\TPagerButtonType;
+use Prado\Web\UI\WebControls\TPagerMode;
+use Prado\Web\UI\WebControls\TWebControl;
+
 Prado::using('System.Web.UI.ActiveControls.TActiveControlAdapter');
 
 /**
diff --git a/framework/Web/UI/ActiveControls/TActivePanel.php b/framework/Web/UI/ActiveControls/TActivePanel.php
index 007a8fba..c715e0b6 100644
--- a/framework/Web/UI/ActiveControls/TActivePanel.php
+++ b/framework/Web/UI/ActiveControls/TActivePanel.php
@@ -14,6 +14,9 @@ namespace Prado\Web\UI\ActiveControls;
 /**
  * Load active control adapter.
  */
+use Prado\Prado;
+use Prado\Web\UI\WebControls\TPanel;
+
 Prado::using('System.Web.UI.ActiveControls.TActiveControlAdapter');
 
 /**
diff --git a/framework/Web/UI/ActiveControls/TActiveRadioButton.php b/framework/Web/UI/ActiveControls/TActiveRadioButton.php
index 4abdfe05..7c464db4 100644
--- a/framework/Web/UI/ActiveControls/TActiveRadioButton.php
+++ b/framework/Web/UI/ActiveControls/TActiveRadioButton.php
@@ -10,6 +10,8 @@
  */
 
 namespace Prado\Web\UI\ActiveControls;
+use Prado\TPropertyValue;
+use Prado\Web\UI\WebControls\TRadioButton;
 
 /**
  * TActiveRadioButton class.
diff --git a/framework/Web/UI/ActiveControls/TActiveRadioButtonItem.php b/framework/Web/UI/ActiveControls/TActiveRadioButtonItem.php
index 32e14ff9..89fa9847 100644
--- a/framework/Web/UI/ActiveControls/TActiveRadioButtonItem.php
+++ b/framework/Web/UI/ActiveControls/TActiveRadioButtonItem.php
@@ -11,6 +11,8 @@
 
 namespace Prado\Web\UI\ActiveControls;
 
+use Prado\Web\UI\WebControls\TRadioButton;
+
 class TActiveRadioButtonItem extends TActiveRadioButton
 {
 	/**
diff --git a/framework/Web/UI/ActiveControls/TActiveRadioButtonList.php b/framework/Web/UI/ActiveControls/TActiveRadioButtonList.php
index a96bc486..4a3d6b1f 100644
--- a/framework/Web/UI/ActiveControls/TActiveRadioButtonList.php
+++ b/framework/Web/UI/ActiveControls/TActiveRadioButtonList.php
@@ -14,6 +14,9 @@ namespace Prado\Web\UI\ActiveControls;
 /**
  * Load active control adapter and active radio button.
  */
+use Prado\Prado;
+use Prado\Web\UI\WebControls\TRadioButtonList;
+
 Prado::using('System.Web.UI.ActiveControls.TActiveListControlAdapter');
 Prado::using('System.Web.UI.ActiveControls.TActiveRadioButton');
 
diff --git a/framework/Web/UI/ActiveControls/TActiveRatingList.php b/framework/Web/UI/ActiveControls/TActiveRatingList.php
index e6e4be47..962ff9d5 100644
--- a/framework/Web/UI/ActiveControls/TActiveRatingList.php
+++ b/framework/Web/UI/ActiveControls/TActiveRatingList.php
@@ -11,6 +11,7 @@
  */
 
 namespace Prado\Web\UI\ActiveControls;
+use Prado\Web\UI\WebControls\TRatingList;
 
 /**
  * TActiveRatingList Class
diff --git a/framework/Web/UI/ActiveControls/TActiveRepeater.php b/framework/Web/UI/ActiveControls/TActiveRepeater.php
index 770c6c0b..323d5743 100644
--- a/framework/Web/UI/ActiveControls/TActiveRepeater.php
+++ b/framework/Web/UI/ActiveControls/TActiveRepeater.php
@@ -8,6 +8,8 @@
  */
 
 namespace Prado\Web\UI\ActiveControls;
+use Prado\Web\UI\ISurroundable;
+use Prado\Web\UI\WebControls\TRepeater;
 
 /**
  * TActiveRepeater class
diff --git a/framework/Web/UI/ActiveControls/TActiveTableCell.php b/framework/Web/UI/ActiveControls/TActiveTableCell.php
index 46da70bc..c0701a79 100644
--- a/framework/Web/UI/ActiveControls/TActiveTableCell.php
+++ b/framework/Web/UI/ActiveControls/TActiveTableCell.php
@@ -14,6 +14,11 @@ namespace Prado\Web\UI\ActiveControls;
 /**
  * Includes the following used classes
  */
+use Prado\Exceptions\TConfigurationException;
+use Prado\Prado;
+use Prado\Web\UI\WebControls\TTableCell;
+use Prado\Web\UI\WebControls\TTableRow;
+
 Prado::using('System.Web.UI.WebControls.TTableRow');
 Prado::using('System.Web.UI.ActiveControls.TActiveControlAdapter');
 Prado::using('System.Web.UI.ActiveControls.TCallbackEventParameter');
diff --git a/framework/Web/UI/ActiveControls/TActiveTableRow.php b/framework/Web/UI/ActiveControls/TActiveTableRow.php
index d6f2c5dd..2547d48a 100644
--- a/framework/Web/UI/ActiveControls/TActiveTableRow.php
+++ b/framework/Web/UI/ActiveControls/TActiveTableRow.php
@@ -14,6 +14,11 @@ namespace Prado\Web\UI\ActiveControls;
 /**
  * Includes the following used classes
  */
+use Prado\Exceptions\TConfigurationException;
+use Prado\Prado;
+use Prado\Web\UI\WebControls\TTable;
+use Prado\Web\UI\WebControls\TTableRow;
+
 Prado::using('System.Web.UI.WebControls.TTableRow');
 Prado::using('System.Web.UI.ActiveControls.TActiveControlAdapter');
 Prado::using('System.Web.UI.ActiveControls.TCallbackEventParameter');
diff --git a/framework/Web/UI/ActiveControls/TActiveTemplateColumn.php b/framework/Web/UI/ActiveControls/TActiveTemplateColumn.php
index a566ed34..c0a49b63 100644
--- a/framework/Web/UI/ActiveControls/TActiveTemplateColumn.php
+++ b/framework/Web/UI/ActiveControls/TActiveTemplateColumn.php
@@ -10,6 +10,10 @@
  */
 
 namespace Prado\Web\UI\ActiveControls;
+use Prado\Prado;
+use Prado\Web\UI\WebControls\IItemDataRenderer;
+use Prado\Web\UI\WebControls\TDataGrid;
+use Prado\Web\UI\WebControls\TTemplateColumn;
 
 /**
  * TActiveTemplateColumn class
diff --git a/framework/Web/UI/ActiveControls/TActiveTextBox.php b/framework/Web/UI/ActiveControls/TActiveTextBox.php
index 8f78de88..15266529 100644
--- a/framework/Web/UI/ActiveControls/TActiveTextBox.php
+++ b/framework/Web/UI/ActiveControls/TActiveTextBox.php
@@ -14,6 +14,9 @@ namespace Prado\Web\UI\ActiveControls;
 /**
  * Load active control adapter.
  */
+use Prado\Prado;
+use Prado\Web\UI\WebControls\TTextBox;
+
 Prado::using('System.Web.UI.ActiveControls.TActiveControlAdapter');
 
 /**
diff --git a/framework/Web/UI/ActiveControls/TAutoComplete.php b/framework/Web/UI/ActiveControls/TAutoComplete.php
index 4faffb01..ab120ebe 100644
--- a/framework/Web/UI/ActiveControls/TAutoComplete.php
+++ b/framework/Web/UI/ActiveControls/TAutoComplete.php
@@ -14,6 +14,11 @@ namespace Prado\Web\UI\ActiveControls;
 /**
  * Load active text box.
  */
+use Prado\Prado;
+use Prado\TPropertyValue;
+use Prado\Web\UI\INamingContainer;
+use Prado\Web\UI\TTemplate;
+
 Prado::using('System.Web.UI.ActiveControls.TActiveTextBox');
 Prado::using('System.Web.UI.ActiveControls.TCallbackEventParameter');
 
diff --git a/framework/Web/UI/ActiveControls/TAutoCompleteTemplate.php b/framework/Web/UI/ActiveControls/TAutoCompleteTemplate.php
index 246bfaf3..f9784975 100644
--- a/framework/Web/UI/ActiveControls/TAutoCompleteTemplate.php
+++ b/framework/Web/UI/ActiveControls/TAutoCompleteTemplate.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\ActiveControls;
+use Prado\Web\UI\ITemplate;
 
 /**
  * TAutoCompleteTemplate class.
diff --git a/framework/Web/UI/ActiveControls/TBaseActiveCallbackControl.php b/framework/Web/UI/ActiveControls/TBaseActiveCallbackControl.php
index 50af1694..ffe00098 100644
--- a/framework/Web/UI/ActiveControls/TBaseActiveCallbackControl.php
+++ b/framework/Web/UI/ActiveControls/TBaseActiveCallbackControl.php
@@ -10,6 +10,9 @@
  */
 
 namespace Prado\Web\UI\ActiveControls;
+use Prado\Exceptions\TConfigurationException;
+use Prado\TPropertyValue;
+use Prado\Web\Javascripts\TJavaScript;
 
 /**
  * TBaseActiveCallbackControl is a common set of options and functionality for
diff --git a/framework/Web/UI/ActiveControls/TBaseActiveControl.php b/framework/Web/UI/ActiveControls/TBaseActiveControl.php
index 74adecc2..3bcf0d95 100644
--- a/framework/Web/UI/ActiveControls/TBaseActiveControl.php
+++ b/framework/Web/UI/ActiveControls/TBaseActiveControl.php
@@ -11,6 +11,11 @@
 
 namespace Prado\Web\UI\ActiveControls;
 
+use Prado\Collections\TMap;
+use Prado\Prado;
+use Prado\TPropertyValue;
+use Prado\Web\UI\TControl;
+
 Prado::using('System.Web.UI.ActiveControls.TCallbackClientSide');
 
 /**
diff --git a/framework/Web/UI/ActiveControls/TCallback.php b/framework/Web/UI/ActiveControls/TCallback.php
index 204e45c2..c5e4db53 100644
--- a/framework/Web/UI/ActiveControls/TCallback.php
+++ b/framework/Web/UI/ActiveControls/TCallback.php
@@ -14,6 +14,9 @@ namespace Prado\Web\UI\ActiveControls;
 /**
  * Load active control adapter.
  */
+use Prado\Prado;
+use Prado\Web\UI\TControl;
+
 Prado::using('System.Web.UI.ActiveControls.TActiveControlAdapter');
 
 /**
diff --git a/framework/Web/UI/ActiveControls/TCallbackClientScript.php b/framework/Web/UI/ActiveControls/TCallbackClientScript.php
index e8656792..c8e4c5de 100644
--- a/framework/Web/UI/ActiveControls/TCallbackClientScript.php
+++ b/framework/Web/UI/ActiveControls/TCallbackClientScript.php
@@ -10,6 +10,14 @@
  */
 
 namespace Prado\Web\UI\ActiveControls;
+use Prado\Collections\TList;
+use Prado\TPropertyValue;
+use Prado\Web\UI\ISurroundable;
+use Prado\Web\UI\TControl;
+use Prado\Web\UI\THtmlWriter;
+use Prado\Web\UI\WebControls\TCheckBox;
+use Prado\Web\UI\WebControls\TCheckBoxList;
+use Prado\Web\UI\WebControls\TListControl;
 
 /**
  * TCallbackClientScript class.
diff --git a/framework/Web/UI/ActiveControls/TCallbackClientSide.php b/framework/Web/UI/ActiveControls/TCallbackClientSide.php
index f98657c3..158dc44b 100644
--- a/framework/Web/UI/ActiveControls/TCallbackClientSide.php
+++ b/framework/Web/UI/ActiveControls/TCallbackClientSide.php
@@ -10,6 +10,9 @@
  */
 
 namespace Prado\Web\UI\ActiveControls;
+use Prado\TPropertyValue;
+use Prado\Web\UI\TClientSideOptions;
+use Prado\Web\UI\TControl;
 
 /**
  * TCallbackClientSide class.
diff --git a/framework/Web/UI/ActiveControls/TCallbackErrorHandler.php b/framework/Web/UI/ActiveControls/TCallbackErrorHandler.php
index 479323a8..b7ea0ec4 100644
--- a/framework/Web/UI/ActiveControls/TCallbackErrorHandler.php
+++ b/framework/Web/UI/ActiveControls/TCallbackErrorHandler.php
@@ -11,6 +11,12 @@
  */
 
 namespace Prado\Web\UI\ActiveControls;
+use Exception;
+use Prado\Exceptions\TErrorHandler;
+use Prado\Exceptions\TPhpErrorException;
+use Prado\Prado;
+use Prado\TApplication;
+use Prado\Web\Javascripts\TJavaScript;
 
 /**
  * TCallbackErrorHandler class.
diff --git a/framework/Web/UI/ActiveControls/TCallbackEventParameter.php b/framework/Web/UI/ActiveControls/TCallbackEventParameter.php
index 515051fb..0f35774c 100644
--- a/framework/Web/UI/ActiveControls/TCallbackEventParameter.php
+++ b/framework/Web/UI/ActiveControls/TCallbackEventParameter.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\ActiveControls;
+use Prado\Web\THttpResponse;
 
 /**
  * TCallbackEventParameter class.
diff --git a/framework/Web/UI/ActiveControls/TCallbackOptions.php b/framework/Web/UI/ActiveControls/TCallbackOptions.php
index 04886508..196a2e54 100644
--- a/framework/Web/UI/ActiveControls/TCallbackOptions.php
+++ b/framework/Web/UI/ActiveControls/TCallbackOptions.php
@@ -10,6 +10,8 @@
  */
 
 namespace Prado\Web\UI\ActiveControls;
+use Prado\Prado;
+use Prado\Web\UI\TControl;
 
 /**
  * TCallbackOptions class.
diff --git a/framework/Web/UI/ActiveControls/TCallbackPageStateTracker.php b/framework/Web/UI/ActiveControls/TCallbackPageStateTracker.php
index 4128fe34..7ec5331e 100644
--- a/framework/Web/UI/ActiveControls/TCallbackPageStateTracker.php
+++ b/framework/Web/UI/ActiveControls/TCallbackPageStateTracker.php
@@ -10,6 +10,8 @@
  */
 
 namespace Prado\Web\UI\ActiveControls;
+use Prado\Collections\TMap;
+use stdClass;
 
 /**
  * TCallbackPageStateTracker class.
diff --git a/framework/Web/UI/ActiveControls/TCallbackResponseAdapter.php b/framework/Web/UI/ActiveControls/TCallbackResponseAdapter.php
index bb0589d9..8ca1d47d 100755
--- a/framework/Web/UI/ActiveControls/TCallbackResponseAdapter.php
+++ b/framework/Web/UI/ActiveControls/TCallbackResponseAdapter.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\ActiveControls;
+use Prado\Web\THttpResponseAdapter;
 
 /**
  * TCallbackResponseAdapter alters the THttpResponse's outputs.
diff --git a/framework/Web/UI/ActiveControls/TCallbackResponseWriter.php b/framework/Web/UI/ActiveControls/TCallbackResponseWriter.php
index aeb95ed0..f6b0df55 100644
--- a/framework/Web/UI/ActiveControls/TCallbackResponseWriter.php
+++ b/framework/Web/UI/ActiveControls/TCallbackResponseWriter.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\ActiveControls;
+use Prado\IO\TTextWriter;
 
 /**
  * TCallbackResponseWriter class.
diff --git a/framework/Web/UI/ActiveControls/TDraggable.php b/framework/Web/UI/ActiveControls/TDraggable.php
index 468562db..b4780eda 100755
--- a/framework/Web/UI/ActiveControls/TDraggable.php
+++ b/framework/Web/UI/ActiveControls/TDraggable.php
@@ -9,6 +9,9 @@
  */
 
 namespace Prado\Web\UI\ActiveControls;
+use Prado\TPropertyValue;
+use Prado\Web\Javascripts\TJavaScript;
+use Prado\Web\UI\WebControls\TPanel;
 
 /**
  * TDraggable is a control which can be dragged
diff --git a/framework/Web/UI/ActiveControls/TDropContainer.php b/framework/Web/UI/ActiveControls/TDropContainer.php
index 6d688501..161bfb8b 100755
--- a/framework/Web/UI/ActiveControls/TDropContainer.php
+++ b/framework/Web/UI/ActiveControls/TDropContainer.php
@@ -14,6 +14,10 @@ namespace Prado\Web\UI\ActiveControls;
 /**
  * Load active control adapter.
  */
+use Prado\Prado;
+use Prado\TPropertyValue;
+use Prado\Web\UI\WebControls\TPanel;
+
 Prado::using('System.Web.UI.ActiveControls.TActiveControlAdapter');
 /**
  * Load active panel.
diff --git a/framework/Web/UI/ActiveControls/TDropContainerEventParameter.php b/framework/Web/UI/ActiveControls/TDropContainerEventParameter.php
index 5844e3cd..3f097b91 100644
--- a/framework/Web/UI/ActiveControls/TDropContainerEventParameter.php
+++ b/framework/Web/UI/ActiveControls/TDropContainerEventParameter.php
@@ -10,6 +10,10 @@
  */
 
 namespace Prado\Web\UI\ActiveControls;
+use Prado\Prado;
+use Prado\TPropertyValue;
+use Prado\Web\Services\TPageService;
+use Prado\Web\UI\TControl;
 
 /**
  * TDropContainerEventParameter class
diff --git a/framework/Web/UI/ActiveControls/TEventTriggeredCallback.php b/framework/Web/UI/ActiveControls/TEventTriggeredCallback.php
index 26c022a9..c4271c25 100644
--- a/framework/Web/UI/ActiveControls/TEventTriggeredCallback.php
+++ b/framework/Web/UI/ActiveControls/TEventTriggeredCallback.php
@@ -11,6 +11,9 @@
 
 namespace Prado\Web\UI\ActiveControls;
 
+use Prado\Prado;
+use Prado\TPropertyValue;
+
 Prado::using('System.Web.UI.ActiveControls.TTriggeredCallback');
 
 /**
diff --git a/framework/Web/UI/ActiveControls/TInPlaceTextBox.php b/framework/Web/UI/ActiveControls/TInPlaceTextBox.php
index 899cf3f8..83c7e825 100644
--- a/framework/Web/UI/ActiveControls/TInPlaceTextBox.php
+++ b/framework/Web/UI/ActiveControls/TInPlaceTextBox.php
@@ -11,6 +11,11 @@
 
 namespace Prado\Web\UI\ActiveControls;
 
+use Prado\Prado;
+use Prado\TPropertyValue;
+use Prado\Web\UI\WebControls\TTextBox;
+use Prado\Web\UI\WebControls\TWebControl;
+
 Prado::using('System.Web.UI.ActiveControls.TActiveTextBox');
 
 /**
diff --git a/framework/Web/UI/ActiveControls/TInvalidCallbackException.php b/framework/Web/UI/ActiveControls/TInvalidCallbackException.php
index 432b7ed6..80a932a8 100644
--- a/framework/Web/UI/ActiveControls/TInvalidCallbackException.php
+++ b/framework/Web/UI/ActiveControls/TInvalidCallbackException.php
@@ -11,6 +11,7 @@
  */
 
 namespace Prado\Web\UI\ActiveControls;
+use Prado\Exceptions\TException;
 
 /**
  * TInvalidCallbackException class.
diff --git a/framework/Web/UI/ActiveControls/TStyleDiff.php b/framework/Web/UI/ActiveControls/TStyleDiff.php
index 496a5883..a7b707e0 100644
--- a/framework/Web/UI/ActiveControls/TStyleDiff.php
+++ b/framework/Web/UI/ActiveControls/TStyleDiff.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\ActiveControls;
+use Prado\Web\UI\WebControls\TStyle;
 
 /**
  * TStyleDiff class.
diff --git a/framework/Web/UI/ActiveControls/TTimeTriggeredCallback.php b/framework/Web/UI/ActiveControls/TTimeTriggeredCallback.php
index 02b4fc01..95696c86 100644
--- a/framework/Web/UI/ActiveControls/TTimeTriggeredCallback.php
+++ b/framework/Web/UI/ActiveControls/TTimeTriggeredCallback.php
@@ -14,6 +14,10 @@ namespace Prado\Web\UI\ActiveControls;
 /**
  * Load active callback control.
  */
+use Prado\Exceptions\TConfigurationException;
+use Prado\Prado;
+use Prado\TPropertyValue;
+
 Prado::using('System.Web.UI.ActiveControls.TCallback');
 
 /**
diff --git a/framework/Web/UI/ActiveControls/TTriggeredCallback.php b/framework/Web/UI/ActiveControls/TTriggeredCallback.php
index 5c677456..21c86e55 100644
--- a/framework/Web/UI/ActiveControls/TTriggeredCallback.php
+++ b/framework/Web/UI/ActiveControls/TTriggeredCallback.php
@@ -11,6 +11,10 @@
 
 namespace Prado\Web\UI\ActiveControls;
 
+use Prado\Exceptions\TConfigurationException;
+use Prado\Prado;
+use Prado\Web\UI\TControl;
+
 Prado::using('System.Web.UI.ActiveControls.TCallback');
 /**
  * TTriggeredCallback abstract Class
diff --git a/framework/Web/UI/ActiveControls/TValueTriggeredCallback.php b/framework/Web/UI/ActiveControls/TValueTriggeredCallback.php
index 8fca817e..04c499a4 100644
--- a/framework/Web/UI/ActiveControls/TValueTriggeredCallback.php
+++ b/framework/Web/UI/ActiveControls/TValueTriggeredCallback.php
@@ -11,6 +11,10 @@
 
 namespace Prado\Web\UI\ActiveControls;
 
+use Prado\Exceptions\TConfigurationException;
+use Prado\Prado;
+use Prado\TPropertyValue;
+
 Prado::using('System.Web.UI.ActiveControls.TTriggeredCallback');
 
 /**
diff --git a/framework/Web/UI/JuiControls/TJuiAutoComplete.php b/framework/Web/UI/JuiControls/TJuiAutoComplete.php
index 224eb306..3145180f 100644
--- a/framework/Web/UI/JuiControls/TJuiAutoComplete.php
+++ b/framework/Web/UI/JuiControls/TJuiAutoComplete.php
@@ -14,6 +14,13 @@ namespace Prado\Web\UI\JuiControls;
 /**
  * Load active text box.
  */
+use Prado\IO\TTextWriter;
+use Prado\Prado;
+use Prado\TPropertyValue;
+use Prado\Web\UI\ActiveControls\TActiveTextBox;
+use Prado\Web\UI\INamingContainer;
+use Prado\Web\UI\TTemplate;
+
 Prado::using('System.Web.UI.ActiveControls.TActiveTextBox');
 Prado::using('System.Web.UI.ActiveControls.TCallbackEventParameter');
 Prado::using('System.Web.UI.JuiControls.TJuiControlAdapter');
diff --git a/framework/Web/UI/JuiControls/TJuiAutoCompleteEventParameter.php b/framework/Web/UI/JuiControls/TJuiAutoCompleteEventParameter.php
index f404ac9a..df50e9bc 100644
--- a/framework/Web/UI/JuiControls/TJuiAutoCompleteEventParameter.php
+++ b/framework/Web/UI/JuiControls/TJuiAutoCompleteEventParameter.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\JuiControls;
+use Prado\Web\UI\ActiveControls\TCallbackEventParameter;
 
 /**
  * TJuiAutoCompleteEventParameter contains the {@link getToken Token} requested by
diff --git a/framework/Web/UI/JuiControls/TJuiAutoCompleteTemplate.php b/framework/Web/UI/JuiControls/TJuiAutoCompleteTemplate.php
index 56c953fd..242e2114 100644
--- a/framework/Web/UI/JuiControls/TJuiAutoCompleteTemplate.php
+++ b/framework/Web/UI/JuiControls/TJuiAutoCompleteTemplate.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\JuiControls;
+use Prado\Web\UI\ITemplate;
 
 /**
  * TJuiAutoCompleteTemplate class.
diff --git a/framework/Web/UI/JuiControls/TJuiControlAdapter.php b/framework/Web/UI/JuiControls/TJuiControlAdapter.php
index 301d424d..e1b03afe 100644
--- a/framework/Web/UI/JuiControls/TJuiControlAdapter.php
+++ b/framework/Web/UI/JuiControls/TJuiControlAdapter.php
@@ -11,6 +11,9 @@
 
 namespace Prado\Web\UI\JuiControls;
 
+use Prado\Prado;
+use Prado\Web\UI\ActiveControls\TActiveControlAdapter;
+
 Prado::using('System.Web.UI.ActiveControls.TActiveControlAdapter');
 
 /**
diff --git a/framework/Web/UI/JuiControls/TJuiControlOptions.php b/framework/Web/UI/JuiControls/TJuiControlOptions.php
index cc065fe5..2836c5ec 100644
--- a/framework/Web/UI/JuiControls/TJuiControlOptions.php
+++ b/framework/Web/UI/JuiControls/TJuiControlOptions.php
@@ -10,6 +10,11 @@
  */
 
 namespace Prado\Web\UI\JuiControls;
+use Prado\Collections\TMap;
+use Prado\Exceptions\THttpException;
+use Prado\Web\Javascripts\TJavaScript;
+use Prado\Web\Javascripts\TJavaScriptLiteral;
+use Prado\Web\UI\TControl;
 
 /**
  * TJuiControlOptions interface
diff --git a/framework/Web/UI/JuiControls/TJuiDraggable.php b/framework/Web/UI/JuiControls/TJuiDraggable.php
index a875557f..86e5d69c 100644
--- a/framework/Web/UI/JuiControls/TJuiDraggable.php
+++ b/framework/Web/UI/JuiControls/TJuiDraggable.php
@@ -11,6 +11,11 @@
 
 namespace Prado\Web\UI\JuiControls;
 
+use Prado\Prado;
+use Prado\Web\Javascripts\TJavaScript;
+use Prado\Web\UI\ActiveControls\ICallbackEventHandler;
+use Prado\Web\UI\ActiveControls\TActivePanel;
+
 Prado::using('System.Web.UI.JuiControls.TJuiControlAdapter');
 Prado::using('System.Web.UI.ActiveControls.TActivePanel');
 
diff --git a/framework/Web/UI/JuiControls/TJuiDroppable.php b/framework/Web/UI/JuiControls/TJuiDroppable.php
index 1d51438c..cec07885 100644
--- a/framework/Web/UI/JuiControls/TJuiDroppable.php
+++ b/framework/Web/UI/JuiControls/TJuiDroppable.php
@@ -11,6 +11,11 @@
 
 namespace Prado\Web\UI\JuiControls;
 
+use Prado\Prado;
+use Prado\Web\Javascripts\TJavaScript;
+use Prado\Web\UI\ActiveControls\ICallbackEventHandler;
+use Prado\Web\UI\ActiveControls\TActivePanel;
+
 Prado::using('System.Web.UI.JuiControls.TJuiControlAdapter');
 Prado::using('System.Web.UI.ActiveControls.TActivePanel');
 
diff --git a/framework/Web/UI/JuiControls/TJuiEventParameter.php b/framework/Web/UI/JuiControls/TJuiEventParameter.php
index 87ed0d84..5ec578b6 100644
--- a/framework/Web/UI/JuiControls/TJuiEventParameter.php
+++ b/framework/Web/UI/JuiControls/TJuiEventParameter.php
@@ -10,6 +10,10 @@
  */
 
 namespace Prado\Web\UI\JuiControls;
+use Prado\Prado;
+use Prado\Web\Services\TPageService;
+use Prado\Web\UI\ActiveControls\TCallbackEventParameter;
+use Prado\Web\UI\TControl;
 
 /**
  * TJuiEventParameter class
diff --git a/framework/Web/UI/JuiControls/TJuiProgressbar.php b/framework/Web/UI/JuiControls/TJuiProgressbar.php
index a4779a1f..8379869a 100644
--- a/framework/Web/UI/JuiControls/TJuiProgressbar.php
+++ b/framework/Web/UI/JuiControls/TJuiProgressbar.php
@@ -11,6 +11,11 @@
 
 namespace Prado\Web\UI\JuiControls;
 
+use Prado\Prado;
+use Prado\Web\Javascripts\TJavaScript;
+use Prado\Web\UI\ActiveControls\ICallbackEventHandler;
+use Prado\Web\UI\ActiveControls\TActivePanel;
+
 Prado::using('System.Web.UI.JuiControls.TJuiControlAdapter');
 Prado::using('System.Web.UI.ActiveControls.TActivePanel');
 
diff --git a/framework/Web/UI/JuiControls/TJuiResizable.php b/framework/Web/UI/JuiControls/TJuiResizable.php
index 54add982..bae005be 100644
--- a/framework/Web/UI/JuiControls/TJuiResizable.php
+++ b/framework/Web/UI/JuiControls/TJuiResizable.php
@@ -11,6 +11,11 @@
 
 namespace Prado\Web\UI\JuiControls;
 
+use Prado\Prado;
+use Prado\Web\Javascripts\TJavaScript;
+use Prado\Web\UI\ActiveControls\ICallbackEventHandler;
+use Prado\Web\UI\ActiveControls\TActivePanel;
+
 Prado::using('System.Web.UI.JuiControls.TJuiControlAdapter');
 Prado::using('System.Web.UI.ActiveControls.TActivePanel');
 
diff --git a/framework/Web/UI/JuiControls/TJuiSelectable.php b/framework/Web/UI/JuiControls/TJuiSelectable.php
index 11376da8..06d251f6 100644
--- a/framework/Web/UI/JuiControls/TJuiSelectable.php
+++ b/framework/Web/UI/JuiControls/TJuiSelectable.php
@@ -11,6 +11,13 @@
 
 namespace Prado\Web\UI\JuiControls;
 
+use Prado\Prado;
+use Prado\Web\Javascripts\TJavaScript;
+use Prado\Web\Javascripts\TJavaScriptLiteral;
+use Prado\Web\UI\ActiveControls\ICallbackEventHandler;
+use Prado\Web\UI\ActiveControls\TActivePanel;
+use Prado\Web\UI\TTemplate;
+
 Prado::using('System.Web.UI.JuiControls.TJuiControlAdapter');
 Prado::using('System.Web.UI.ActiveControls.TActivePanel');
 
diff --git a/framework/Web/UI/JuiControls/TJuiSelectableTemplate.php b/framework/Web/UI/JuiControls/TJuiSelectableTemplate.php
index 723462a9..f7dfed3b 100644
--- a/framework/Web/UI/JuiControls/TJuiSelectableTemplate.php
+++ b/framework/Web/UI/JuiControls/TJuiSelectableTemplate.php
@@ -10,6 +10,8 @@
  */
 
 namespace Prado\Web\UI\JuiControls;
+use Prado\Web\UI\ITemplate;
+use Prado\Web\UI\ITemplate;
 
 /**
  * TJuiSelectableTemplate class.
diff --git a/framework/Web/UI/JuiControls/TJuiSortable.php b/framework/Web/UI/JuiControls/TJuiSortable.php
index 9072a72d..edfb68c0 100644
--- a/framework/Web/UI/JuiControls/TJuiSortable.php
+++ b/framework/Web/UI/JuiControls/TJuiSortable.php
@@ -11,6 +11,13 @@
 
 namespace Prado\Web\UI\JuiControls;
 
+use Prado\Prado;
+use Prado\Web\Javascripts\TJavaScript;
+use Prado\Web\Javascripts\TJavaScriptLiteral;
+use Prado\Web\UI\ActiveControls\ICallbackEventHandler;
+use Prado\Web\UI\ActiveControls\TActivePanel;
+use Prado\Web\UI\TTemplate;
+
 Prado::using('System.Web.UI.JuiControls.TJuiControlAdapter');
 Prado::using('System.Web.UI.ActiveControls.TActivePanel');
 
diff --git a/framework/Web/UI/JuiControls/TJuiSortableTemplate.php b/framework/Web/UI/JuiControls/TJuiSortableTemplate.php
index 121a2bdc..991c2d0c 100644
--- a/framework/Web/UI/JuiControls/TJuiSortableTemplate.php
+++ b/framework/Web/UI/JuiControls/TJuiSortableTemplate.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\JuiControls;
+use Prado\Web\UI\ITemplate;
 
 /**
  * TJuiSortableTemplate class.
diff --git a/framework/Web/UI/TCachePageStatePersister.php b/framework/Web/UI/TCachePageStatePersister.php
index 53dd5916..56dabe62 100644
--- a/framework/Web/UI/TCachePageStatePersister.php
+++ b/framework/Web/UI/TCachePageStatePersister.php
@@ -15,6 +15,7 @@ use Prado\Prado;
 use Prado\Exceptions\TConfigurationException;
 use Prado\Exceptions\THttpException;
 use Prado\Exceptions\TInvalidDataValueException;
+use Prado\TPropertyValue;
 
 /**
  * TCachePageStatePersister class
diff --git a/framework/Web/UI/TControl.php b/framework/Web/UI/TControl.php
index 99096311..a34d7583 100644
--- a/framework/Web/UI/TControl.php
+++ b/framework/Web/UI/TControl.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI;
+use Exception;
 use Prado\Exceptions\TInvalidDataValueException;
 use Prado\Exceptions\TInvalidOperationException;
 use Prado\Prado;
diff --git a/framework/Web/UI/TPage.php b/framework/Web/UI/TPage.php
index 796d71cd..e768f900 100644
--- a/framework/Web/UI/TPage.php
+++ b/framework/Web/UI/TPage.php
@@ -13,6 +13,7 @@ namespace Prado\Web\UI;
 use Prado\Collections\TList;
 use Prado\Collections\TMap;
 use Prado\Collections\TStack;
+use Prado\Data\ActiveRecord\TActiveRecord;
 use Prado\Exceptions\TConfigurationException;
 use Prado\Exceptions\THttpException;
 use Prado\Exceptions\TInvalidDataValueException;
@@ -20,6 +21,7 @@ use Prado\Exceptions\TInvalidDataTypeException;
 use Prado\Exceptions\TInvalidOperationException;
 use Prado\Prado;
 use Prado\TPropertyValue;
+use Prado\Web\Javascripts\TJavaScript;
 use Prado\Web\UI\ActiveControls\TActivePageAdapter;
 use Prado\Web\UI\ActiveControls\TCallbackClientScript;
 use Prado\Web\UI\WebControls\THead;
diff --git a/framework/Web/UI/TTemplateManager.php b/framework/Web/UI/TTemplateManager.php
index 31f7c56d..a56b89a1 100644
--- a/framework/Web/UI/TTemplateManager.php
+++ b/framework/Web/UI/TTemplateManager.php
@@ -11,6 +11,7 @@
 
 namespace Prado\Web\UI;
 use Prado\Prado;
+use Prado\TApplicationMode;
 
 /**
  * TTemplateManager class
diff --git a/framework/Web/UI/WebControls/TAccordion.php b/framework/Web/UI/WebControls/TAccordion.php
index e615324a..eee0ad65 100644
--- a/framework/Web/UI/WebControls/TAccordion.php
+++ b/framework/Web/UI/WebControls/TAccordion.php
@@ -11,6 +11,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Exceptions\TInvalidOperationException;
 use Prado\TPropertyValue;
 use Prado\Exceptions\TInvalidDataValueException;
 use Prado\Web\Javascripts\TJavaScript;
diff --git a/framework/Web/UI/WebControls/TBaseDataList.php b/framework/Web/UI/WebControls/TBaseDataList.php
index 7d6a21bf..717a2feb 100644
--- a/framework/Web/UI/WebControls/TBaseDataList.php
+++ b/framework/Web/UI/WebControls/TBaseDataList.php
@@ -10,6 +10,8 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Collections\TList;
+use Prado\Util\TDataFieldAccessor;
 
 /**
  * TBaseDataList class
diff --git a/framework/Web/UI/WebControls/TBaseValidator.php b/framework/Web/UI/WebControls/TBaseValidator.php
index 43834246..f89165b7 100644
--- a/framework/Web/UI/WebControls/TBaseValidator.php
+++ b/framework/Web/UI/WebControls/TBaseValidator.php
@@ -10,9 +10,12 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Exceptions\TConfigurationException;
+use Prado\Exceptions\TNotSupportedException;
 use Prado\TPropertyValue;
 use Prado\Exceptions\TInvalidDataTypeException;
 use Prado\Web\Javascripts\TJavaScript;
+use Prado\Web\UI\IValidator;
 
 /**
  * TBaseValidator class
diff --git a/framework/Web/UI/WebControls/TBoundColumn.php b/framework/Web/UI/WebControls/TBoundColumn.php
index 36b9a143..37ad3262 100644
--- a/framework/Web/UI/WebControls/TBoundColumn.php
+++ b/framework/Web/UI/WebControls/TBoundColumn.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Prado;
 use Prado\TPropertyValue;
 
 /**
diff --git a/framework/Web/UI/WebControls/TBulletedList.php b/framework/Web/UI/WebControls/TBulletedList.php
index 31df8afd..784ff94a 100644
--- a/framework/Web/UI/WebControls/TBulletedList.php
+++ b/framework/Web/UI/WebControls/TBulletedList.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Exceptions\TNotSupportedException;
 use Prado\TPropertyValue;
 use Prado\Web\THttpUtility;
 
diff --git a/framework/Web/UI/WebControls/TCaptcha.php b/framework/Web/UI/WebControls/TCaptcha.php
index 33ab6b9b..5e666d3f 100644
--- a/framework/Web/UI/WebControls/TCaptcha.php
+++ b/framework/Web/UI/WebControls/TCaptcha.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Exceptions\TConfigurationException;
 use Prado\TPropertyValue;
 
 /**
diff --git a/framework/Web/UI/WebControls/TCaptchaValidator.php b/framework/Web/UI/WebControls/TCaptchaValidator.php
index e2c44f9b..148cb627 100644
--- a/framework/Web/UI/WebControls/TCaptchaValidator.php
+++ b/framework/Web/UI/WebControls/TCaptchaValidator.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Exceptions\TConfigurationException;
 use Prado\TPropertyValue;
 
 /**
diff --git a/framework/Web/UI/WebControls/TCheckBox.php b/framework/Web/UI/WebControls/TCheckBox.php
index f9f451c3..1ff69ba6 100644
--- a/framework/Web/UI/WebControls/TCheckBox.php
+++ b/framework/Web/UI/WebControls/TCheckBox.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Collections\TAttributeCollection;
 use Prado\TPropertyValue;
 
 /**
diff --git a/framework/Web/UI/WebControls/TCheckBoxList.php b/framework/Web/UI/WebControls/TCheckBoxList.php
index d680ec77..533ac527 100644
--- a/framework/Web/UI/WebControls/TCheckBoxList.php
+++ b/framework/Web/UI/WebControls/TCheckBoxList.php
@@ -11,6 +11,7 @@
 
 namespace Prado\Web\UI\WebControls;
 use Prado\TPropertyValue;
+use Prado\Web\UI\ActiveControls\IActiveControl;
 
 /**
  * TCheckBoxList class
diff --git a/framework/Web/UI/WebControls/TClientSideValidationSummaryOptions.php b/framework/Web/UI/WebControls/TClientSideValidationSummaryOptions.php
index f0090b87..3bbec73d 100644
--- a/framework/Web/UI/WebControls/TClientSideValidationSummaryOptions.php
+++ b/framework/Web/UI/WebControls/TClientSideValidationSummaryOptions.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Web\UI\TClientSideOptions;
 
 /**
  * TClientSideValidationSummaryOptions class.
diff --git a/framework/Web/UI/WebControls/TCompareValidator.php b/framework/Web/UI/WebControls/TCompareValidator.php
index a62ab5d1..a4c44e82 100644
--- a/framework/Web/UI/WebControls/TCompareValidator.php
+++ b/framework/Web/UI/WebControls/TCompareValidator.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Prado;
 use Prado\TPropertyValue;
 use Prado\Exceptions\TInvalidDataValueException;
 
diff --git a/framework/Web/UI/WebControls/TCompleteWizardStep.php b/framework/Web/UI/WebControls/TCompleteWizardStep.php
index 895e2046..073ac3d2 100644
--- a/framework/Web/UI/WebControls/TCompleteWizardStep.php
+++ b/framework/Web/UI/WebControls/TCompleteWizardStep.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Exceptions\TInvalidOperationException;
 
 /**
  * TCompleteWizardStep class.
diff --git a/framework/Web/UI/WebControls/TConditional.php b/framework/Web/UI/WebControls/TConditional.php
index 1a88c0a7..e4c08ef2 100644
--- a/framework/Web/UI/WebControls/TConditional.php
+++ b/framework/Web/UI/WebControls/TConditional.php
@@ -12,6 +12,7 @@
 namespace Prado\Web\UI\WebControls;
 use Prado\TPropertyValue;
 use Prado\Exceptions\TInvalidDataValueException;
+use Prado\Web\UI\ITemplate;
 
 /**
  * TConditional class.
diff --git a/framework/Web/UI/WebControls/TContent.php b/framework/Web/UI/WebControls/TContent.php
index e75b6b81..a06463e6 100644
--- a/framework/Web/UI/WebControls/TContent.php
+++ b/framework/Web/UI/WebControls/TContent.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Exceptions\TConfigurationException;
 use Prado\Web\UI\TControl;
 use Prado\Web\UI\INamingContainer;
 
diff --git a/framework/Web/UI/WebControls/TContentPlaceHolder.php b/framework/Web/UI/WebControls/TContentPlaceHolder.php
index 380a33fd..af50a8ce 100644
--- a/framework/Web/UI/WebControls/TContentPlaceHolder.php
+++ b/framework/Web/UI/WebControls/TContentPlaceHolder.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Exceptions\TConfigurationException;
 
 /**
  * TContentPlaceHolder class
diff --git a/framework/Web/UI/WebControls/TDataBoundControl.php b/framework/Web/UI/WebControls/TDataBoundControl.php
index bf3778cf..b12fcf35 100644
--- a/framework/Web/UI/WebControls/TDataBoundControl.php
+++ b/framework/Web/UI/WebControls/TDataBoundControl.php
@@ -10,6 +10,8 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Collections\TPagedDataSource;
+use Prado\Data\TDbDataReader;
 use Prado\TPropertyValue;
 use Prado\Exceptions\TInvalidDataValueException;
 use Prado\Exceptions\TInvalidDataTypeException;
diff --git a/framework/Web/UI/WebControls/TDataGrid.php b/framework/Web/UI/WebControls/TDataGrid.php
index 56bb5fa2..d8c29ddd 100644
--- a/framework/Web/UI/WebControls/TDataGrid.php
+++ b/framework/Web/UI/WebControls/TDataGrid.php
@@ -15,8 +15,11 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Collections\TList;
+use Prado\Collections\TPagedDataSource;
 use Prado\TPropertyValue;
 use Prado\Exceptions\TInvalidDataTypeException;
+use Prado\Web\UI\ITemplate;
 
 /**
  * TDataGrid class
diff --git a/framework/Web/UI/WebControls/TDataGridColumn.php b/framework/Web/UI/WebControls/TDataGridColumn.php
index 0617782b..04cdf940 100644
--- a/framework/Web/UI/WebControls/TDataGridColumn.php
+++ b/framework/Web/UI/WebControls/TDataGridColumn.php
@@ -10,8 +10,12 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Exception;
+use Prado\Prado;
 use Prado\TPropertyValue;
 use Prado\Exceptions\TInvalidDataValueException;
+use Prado\Util\TDataFieldAccessor;
+use Prado\Web\UI\TControl;
 
 /**
  * TDataGridColumn class
diff --git a/framework/Web/UI/WebControls/TDataGridColumnCollection.php b/framework/Web/UI/WebControls/TDataGridColumnCollection.php
index e38bfef0..aa8c8c69 100644
--- a/framework/Web/UI/WebControls/TDataGridColumnCollection.php
+++ b/framework/Web/UI/WebControls/TDataGridColumnCollection.php
@@ -16,6 +16,7 @@
 
 namespace Prado\Web\UI\WebControls;
 use Prado\Exceptions\TInvalidDataTypeException;
+use Prado\Web\UI\TControl;
 
 /**
  * TDataGridColumnCollection class.
diff --git a/framework/Web/UI/WebControls/TDataList.php b/framework/Web/UI/WebControls/TDataList.php
index 1b1a3bfd..809ac9ba 100644
--- a/framework/Web/UI/WebControls/TDataList.php
+++ b/framework/Web/UI/WebControls/TDataList.php
@@ -10,9 +10,12 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Exceptions\TInvalidOperationException;
+use Prado\Prado;
 use Prado\TPropertyValue;
 use Prado\Exceptions\TInvalidDataValueException;
 use Prado\Exceptions\TInvalidDataTypeException;
+use Prado\Web\UI\ITemplate;
 
 /**
  * TDataList class
diff --git a/framework/Web/UI/WebControls/TDataListCommandEventParameter.php b/framework/Web/UI/WebControls/TDataListCommandEventParameter.php
index 9c308521..0984392c 100644
--- a/framework/Web/UI/WebControls/TDataListCommandEventParameter.php
+++ b/framework/Web/UI/WebControls/TDataListCommandEventParameter.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Web\UI\TControl;
 
 /**
  * TDataListCommandEventParameter class
diff --git a/framework/Web/UI/WebControls/TDataListItemCollection.php b/framework/Web/UI/WebControls/TDataListItemCollection.php
index 3015e5e7..15c8a020 100644
--- a/framework/Web/UI/WebControls/TDataListItemCollection.php
+++ b/framework/Web/UI/WebControls/TDataListItemCollection.php
@@ -11,6 +11,7 @@
 
 namespace Prado\Web\UI\WebControls;
 use Prado\Exceptions\TInvalidDataTypeException;
+use Prado\Web\UI\TControl;
 
 /**
  * TDataListItemCollection class.
diff --git a/framework/Web/UI/WebControls/TDataListItemEventParameter.php b/framework/Web/UI/WebControls/TDataListItemEventParameter.php
index f023db3b..79463e50 100644
--- a/framework/Web/UI/WebControls/TDataListItemEventParameter.php
+++ b/framework/Web/UI/WebControls/TDataListItemEventParameter.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Web\UI\TControl;
 
 /**
  * TDataListItemEventParameter class
diff --git a/framework/Web/UI/WebControls/TDataRenderer.php b/framework/Web/UI/WebControls/TDataRenderer.php
index 32c10d8a..2ec825d6 100644
--- a/framework/Web/UI/WebControls/TDataRenderer.php
+++ b/framework/Web/UI/WebControls/TDataRenderer.php
@@ -11,6 +11,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Web\UI\TTemplateControl;
 
 /**
  * TDataRenderer class
diff --git a/framework/Web/UI/WebControls/TDataSourceControl.php b/framework/Web/UI/WebControls/TDataSourceControl.php
index e4a405c2..731fda96 100644
--- a/framework/Web/UI/WebControls/TDataSourceControl.php
+++ b/framework/Web/UI/WebControls/TDataSourceControl.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Exceptions\TNotSupportedException;
 
 /**
  * TDataSourceControl class
diff --git a/framework/Web/UI/WebControls/TDataSourceView.php b/framework/Web/UI/WebControls/TDataSourceView.php
index 251bf572..eb76b542 100644
--- a/framework/Web/UI/WebControls/TDataSourceView.php
+++ b/framework/Web/UI/WebControls/TDataSourceView.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Exceptions\TNotSupportedException;
 
 /**
  * TDataSourceView class
diff --git a/framework/Web/UI/WebControls/TDataTypeValidator.php b/framework/Web/UI/WebControls/TDataTypeValidator.php
index 4ff2f89b..4d4b5919 100644
--- a/framework/Web/UI/WebControls/TDataTypeValidator.php
+++ b/framework/Web/UI/WebControls/TDataTypeValidator.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Prado;
 use Prado\TPropertyValue;
 
 /**
diff --git a/framework/Web/UI/WebControls/TDatePicker.php b/framework/Web/UI/WebControls/TDatePicker.php
index d88eb38a..5483b6b2 100644
--- a/framework/Web/UI/WebControls/TDatePicker.php
+++ b/framework/Web/UI/WebControls/TDatePicker.php
@@ -10,8 +10,11 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Exceptions\TNotSupportedException;
+use Prado\Prado;
 use Prado\TPropertyValue;
 use Prado\Web\Javascripts\TJavaScript;
+use Prado\Web\UI\TControl;
 
 /**
  *
diff --git a/framework/Web/UI/WebControls/TDatePickerClientScript.php b/framework/Web/UI/WebControls/TDatePickerClientScript.php
index 6be4b596..881b3d41 100644
--- a/framework/Web/UI/WebControls/TDatePickerClientScript.php
+++ b/framework/Web/UI/WebControls/TDatePickerClientScript.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Web\UI\TClientSideOptions;
 
 /**
  * TDatePickerClientScript class.
diff --git a/framework/Web/UI/WebControls/TDropDownList.php b/framework/Web/UI/WebControls/TDropDownList.php
index cc1a7a9f..9ae3085f 100644
--- a/framework/Web/UI/WebControls/TDropDownList.php
+++ b/framework/Web/UI/WebControls/TDropDownList.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Exceptions\TNotSupportedException;
 use Prado\TPropertyValue;
 
 /**
diff --git a/framework/Web/UI/WebControls/TEditCommandColumn.php b/framework/Web/UI/WebControls/TEditCommandColumn.php
index 07eec55b..48fff83c 100644
--- a/framework/Web/UI/WebControls/TEditCommandColumn.php
+++ b/framework/Web/UI/WebControls/TEditCommandColumn.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Prado;
 use Prado\TPropertyValue;
 
 /**
diff --git a/framework/Web/UI/WebControls/THiddenField.php b/framework/Web/UI/WebControls/THiddenField.php
index b9138e7c..f73cf61a 100644
--- a/framework/Web/UI/WebControls/THiddenField.php
+++ b/framework/Web/UI/WebControls/THiddenField.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Exceptions\TNotSupportedException;
 use Prado\TPropertyValue;
 
 /**
diff --git a/framework/Web/UI/WebControls/THotSpot.php b/framework/Web/UI/WebControls/THotSpot.php
index fe267a75..1d2624f2 100644
--- a/framework/Web/UI/WebControls/THotSpot.php
+++ b/framework/Web/UI/WebControls/THotSpot.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Collections\TAttributeCollection;
 use Prado\TPropertyValue;
 
 /**
diff --git a/framework/Web/UI/WebControls/THtmlArea.php b/framework/Web/UI/WebControls/THtmlArea.php
index 3856cdb1..b1ca7119 100644
--- a/framework/Web/UI/WebControls/THtmlArea.php
+++ b/framework/Web/UI/WebControls/THtmlArea.php
@@ -10,6 +10,10 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Exceptions\TConfigurationException;
+use Prado\Exceptions\TInvalidOperationException;
+use Prado\Prado;
+use Prado\TApplicationMode;
 use Prado\TPropertyValue;
 use Prado\Web\Javascripts\TJavaScript;
 
diff --git a/framework/Web/UI/WebControls/THtmlArea4.php b/framework/Web/UI/WebControls/THtmlArea4.php
index c5410ffd..e81e624e 100644
--- a/framework/Web/UI/WebControls/THtmlArea4.php
+++ b/framework/Web/UI/WebControls/THtmlArea4.php
@@ -10,6 +10,9 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Exceptions\TInvalidOperationException;
+use Prado\Prado;
+use Prado\TApplicationMode;
 use Prado\TPropertyValue;
 use Prado\Web\Javascripts\TJavaScript;
 
diff --git a/framework/Web/UI/WebControls/THyperLink.php b/framework/Web/UI/WebControls/THyperLink.php
index f265e722..3c73503f 100644
--- a/framework/Web/UI/WebControls/THyperLink.php
+++ b/framework/Web/UI/WebControls/THyperLink.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Prado;
 use Prado\Web\THttpUtility;
 
 /**
diff --git a/framework/Web/UI/WebControls/TImageButton.php b/framework/Web/UI/WebControls/TImageButton.php
index 0a0b7ec7..e1c89157 100644
--- a/framework/Web/UI/WebControls/TImageButton.php
+++ b/framework/Web/UI/WebControls/TImageButton.php
@@ -11,6 +11,7 @@
 
 namespace Prado\Web\UI\WebControls;
 use Prado\TPropertyValue;
+use Prado\Web\UI\IPostBackEventHandler;
 
 /**
  * TImageButton class
diff --git a/framework/Web/UI/WebControls/TKeyboard.php b/framework/Web/UI/WebControls/TKeyboard.php
index 2aeb9d9e..edb9fe64 100644
--- a/framework/Web/UI/WebControls/TKeyboard.php
+++ b/framework/Web/UI/WebControls/TKeyboard.php
@@ -11,6 +11,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Exceptions\TConfigurationException;
 use Prado\TPropertyValue;
 use Prado\Web\Javascripts\TJavaScript;
 
diff --git a/framework/Web/UI/WebControls/TListControl.php b/framework/Web/UI/WebControls/TListControl.php
index dac9a196..f784702d 100644
--- a/framework/Web/UI/WebControls/TListControl.php
+++ b/framework/Web/UI/WebControls/TListControl.php
@@ -11,7 +11,10 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Exception;
+use Prado\Exceptions\TNotSupportedException;
 use Prado\TPropertyValue;
+use Prado\Util\TDataFieldAccessor;
 use Prado\Web\THttpUtility;
 use Prado\Exceptions\TInvalidDataValueException;
 
diff --git a/framework/Web/UI/WebControls/TListControlValidator.php b/framework/Web/UI/WebControls/TListControlValidator.php
index 41c5636e..3198f147 100644
--- a/framework/Web/UI/WebControls/TListControlValidator.php
+++ b/framework/Web/UI/WebControls/TListControlValidator.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Exceptions\TConfigurationException;
 use Prado\TPropertyValue;
 
 /**
diff --git a/framework/Web/UI/WebControls/TListItem.php b/framework/Web/UI/WebControls/TListItem.php
index 9e93b338..ec6be866 100644
--- a/framework/Web/UI/WebControls/TListItem.php
+++ b/framework/Web/UI/WebControls/TListItem.php
@@ -10,6 +10,8 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Collections\TAttributeCollection;
+use Prado\Collections\TMap;
 use Prado\TPropertyValue;
 
 /**
diff --git a/framework/Web/UI/WebControls/TLiteral.php b/framework/Web/UI/WebControls/TLiteral.php
index dc15ad0c..874512a1 100644
--- a/framework/Web/UI/WebControls/TLiteral.php
+++ b/framework/Web/UI/WebControls/TLiteral.php
@@ -11,6 +11,7 @@
 
 namespace Prado\Web\UI\WebControls;
 use Prado\TPropertyValue;
+use Prado\Web\THttpUtility;
 
 /**
  * TLiteral class
diff --git a/framework/Web/UI/WebControls/TMarkdown.php b/framework/Web/UI/WebControls/TMarkdown.php
index 8d234820..a4a49648 100644
--- a/framework/Web/UI/WebControls/TMarkdown.php
+++ b/framework/Web/UI/WebControls/TMarkdown.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Parsedown;
 
 /**
  * TMarkdown class
diff --git a/framework/Web/UI/WebControls/TMultiView.php b/framework/Web/UI/WebControls/TMultiView.php
index b3995c3e..0c6b3d7b 100644
--- a/framework/Web/UI/WebControls/TMultiView.php
+++ b/framework/Web/UI/WebControls/TMultiView.php
@@ -10,8 +10,11 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Exceptions\TConfigurationException;
+use Prado\Exceptions\TInvalidOperationException;
 use Prado\TPropertyValue;
 use Prado\Exceptions\TInvalidDataValueException;
+use Prado\Web\UI\TControl;
 
 /**
  * TMultiView class
diff --git a/framework/Web/UI/WebControls/TOutputCache.php b/framework/Web/UI/WebControls/TOutputCache.php
index 8ff22157..1a7785d0 100644
--- a/framework/Web/UI/WebControls/TOutputCache.php
+++ b/framework/Web/UI/WebControls/TOutputCache.php
@@ -10,6 +10,10 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Caching\ICache;
+use Prado\Exceptions\TConfigurationException;
+use Prado\IO\TTextWriter;
+use Prado\Prado;
 use Prado\TPropertyValue;
 use Prado\Exceptions\TInvalidDataValueException;
 
diff --git a/framework/Web/UI/WebControls/TOutputCacheTextWriterMulti.php b/framework/Web/UI/WebControls/TOutputCacheTextWriterMulti.php
index 52bbf772..14809f43 100644
--- a/framework/Web/UI/WebControls/TOutputCacheTextWriterMulti.php
+++ b/framework/Web/UI/WebControls/TOutputCacheTextWriterMulti.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\IO\TTextWriter;
 
 /**
  * TOutputCacheTextWriterMulti class
diff --git a/framework/Web/UI/WebControls/TPager.php b/framework/Web/UI/WebControls/TPager.php
index aa7cda29..2a37021f 100644
--- a/framework/Web/UI/WebControls/TPager.php
+++ b/framework/Web/UI/WebControls/TPager.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Exceptions\TConfigurationException;
 use Prado\TPropertyValue;
 use Prado\Exceptions\TInvalidDataValueException;
 
diff --git a/framework/Web/UI/WebControls/TPagerPageChangedEventParameter.php b/framework/Web/UI/WebControls/TPagerPageChangedEventParameter.php
index 53d46289..9343fc71 100644
--- a/framework/Web/UI/WebControls/TPagerPageChangedEventParameter.php
+++ b/framework/Web/UI/WebControls/TPagerPageChangedEventParameter.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Web\UI\TControl;
 
 /**
  * TPagerPageChangedEventParameter class
diff --git a/framework/Web/UI/WebControls/TRadioButtonList.php b/framework/Web/UI/WebControls/TRadioButtonList.php
index 57368add..2bcd78ac 100644
--- a/framework/Web/UI/WebControls/TRadioButtonList.php
+++ b/framework/Web/UI/WebControls/TRadioButtonList.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Exceptions\TNotSupportedException;
 
 /**
  * TRadioButtonList class
diff --git a/framework/Web/UI/WebControls/TRangeValidator.php b/framework/Web/UI/WebControls/TRangeValidator.php
index 81ccd4da..8d9372fa 100644
--- a/framework/Web/UI/WebControls/TRangeValidator.php
+++ b/framework/Web/UI/WebControls/TRangeValidator.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Prado;
 use Prado\TPropertyValue;
 
 /**
diff --git a/framework/Web/UI/WebControls/TReCaptcha.php b/framework/Web/UI/WebControls/TReCaptcha.php
index c45c20da..1bde0016 100644
--- a/framework/Web/UI/WebControls/TReCaptcha.php
+++ b/framework/Web/UI/WebControls/TReCaptcha.php
@@ -11,8 +11,10 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Exceptions\TConfigurationException;
 use Prado\TPropertyValue;
 use Prado\Web\Javascripts\TJavaScript;
+use Prado\Web\Javascripts\TJavaScriptLiteral;
 
 /**
  * TReCaptcha class.
diff --git a/framework/Web/UI/WebControls/TReCaptchaValidator.php b/framework/Web/UI/WebControls/TReCaptchaValidator.php
index 80e195e0..6f596e3c 100644
--- a/framework/Web/UI/WebControls/TReCaptchaValidator.php
+++ b/framework/Web/UI/WebControls/TReCaptchaValidator.php
@@ -11,6 +11,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Exception;
 use Prado\Web\Javascripts\TJavaScript;
 
 /**
diff --git a/framework/Web/UI/WebControls/TRepeater.php b/framework/Web/UI/WebControls/TRepeater.php
index d22a66ed..9f079ad3 100644
--- a/framework/Web/UI/WebControls/TRepeater.php
+++ b/framework/Web/UI/WebControls/TRepeater.php
@@ -14,6 +14,8 @@ use Prado\Exceptions\TInvalidDataTypeException;
 use Prado\Exceptions\TInvalidDataValueException;
 use Prado\Collections\TMap;
 use Prado\Collections\TList;
+use Prado\Prado;
+use Prado\Util\TDataFieldAccessor;
 
 /**
  * TRepeater class.
diff --git a/framework/Web/UI/WebControls/TRepeaterCommandEventParameter.php b/framework/Web/UI/WebControls/TRepeaterCommandEventParameter.php
index e6e9d240..f28f1063 100644
--- a/framework/Web/UI/WebControls/TRepeaterCommandEventParameter.php
+++ b/framework/Web/UI/WebControls/TRepeaterCommandEventParameter.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Web\UI\TControl;
 
 /**
  * TRepeaterCommandEventParameter class
diff --git a/framework/Web/UI/WebControls/TRepeaterItemEventParameter.php b/framework/Web/UI/WebControls/TRepeaterItemEventParameter.php
index 2d86df38..c8321228 100644
--- a/framework/Web/UI/WebControls/TRepeaterItemEventParameter.php
+++ b/framework/Web/UI/WebControls/TRepeaterItemEventParameter.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Web\UI\TControl;
 
 /**
  * TRepeaterItemEventParameter class
diff --git a/framework/Web/UI/WebControls/TSafeHtml.php b/framework/Web/UI/WebControls/TSafeHtml.php
index aa5316e0..b60291b7 100644
--- a/framework/Web/UI/WebControls/TSafeHtml.php
+++ b/framework/Web/UI/WebControls/TSafeHtml.php
@@ -10,6 +10,8 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\IO\TTextWriter;
+use Prado\Prado;
 use Prado\TPropertyValue;
 
 /**
diff --git a/framework/Web/UI/WebControls/TSliderClientScript.php b/framework/Web/UI/WebControls/TSliderClientScript.php
index 3dfd14d5..3758d87d 100644
--- a/framework/Web/UI/WebControls/TSliderClientScript.php
+++ b/framework/Web/UI/WebControls/TSliderClientScript.php
@@ -11,6 +11,8 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Web\Javascripts\TJavaScript;
+use Prado\Web\UI\TClientSideOptions;
 
 /**
  * TSliderClientScript class.
diff --git a/framework/Web/UI/WebControls/TTabPanel.php b/framework/Web/UI/WebControls/TTabPanel.php
index 4186ce3d..1f5b27a7 100644
--- a/framework/Web/UI/WebControls/TTabPanel.php
+++ b/framework/Web/UI/WebControls/TTabPanel.php
@@ -11,6 +11,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Exceptions\TInvalidOperationException;
 use Prado\TPropertyValue;
 use Prado\Exceptions\TInvalidDataValueException;
 use Prado\Web\Javascripts\TJavaScript;
diff --git a/framework/Web/UI/WebControls/TTable.php b/framework/Web/UI/WebControls/TTable.php
index b189e058..437aab2b 100644
--- a/framework/Web/UI/WebControls/TTable.php
+++ b/framework/Web/UI/WebControls/TTable.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Exceptions\TConfigurationException;
 use Prado\TPropertyValue;
 
 /**
diff --git a/framework/Web/UI/WebControls/TTableFooterRow.php b/framework/Web/UI/WebControls/TTableFooterRow.php
index 2414c613..ce1ede3c 100644
--- a/framework/Web/UI/WebControls/TTableFooterRow.php
+++ b/framework/Web/UI/WebControls/TTableFooterRow.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Exceptions\TInvalidOperationException;
 
 /**
  * TTableFooterRow class.
diff --git a/framework/Web/UI/WebControls/TTableHeaderRow.php b/framework/Web/UI/WebControls/TTableHeaderRow.php
index d6ca6146..2c773aed 100644
--- a/framework/Web/UI/WebControls/TTableHeaderRow.php
+++ b/framework/Web/UI/WebControls/TTableHeaderRow.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Exceptions\TInvalidOperationException;
 
 /**
  * TTableHeaderRow class.
diff --git a/framework/Web/UI/WebControls/TTemplateColumn.php b/framework/Web/UI/WebControls/TTemplateColumn.php
index b0b7167a..adb32970 100644
--- a/framework/Web/UI/WebControls/TTemplateColumn.php
+++ b/framework/Web/UI/WebControls/TTemplateColumn.php
@@ -10,7 +10,9 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Web\UI\ITemplate;
 use Prado\Exceptions\TInvalidDataTypeException;
+use Prado\Prado;
 
 /**
  * TTemplateColumn class
diff --git a/framework/Web/UI/WebControls/TTemplatedWizardStep.php b/framework/Web/UI/WebControls/TTemplatedWizardStep.php
index c887d153..e782c635 100644
--- a/framework/Web/UI/WebControls/TTemplatedWizardStep.php
+++ b/framework/Web/UI/WebControls/TTemplatedWizardStep.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Web\UI\ITemplate;
 
 /**
  * TTemplatedWizardStep class.
diff --git a/framework/Web/UI/WebControls/TTextBox.php b/framework/Web/UI/WebControls/TTextBox.php
index 4e8252ca..9ed41ec9 100644
--- a/framework/Web/UI/WebControls/TTextBox.php
+++ b/framework/Web/UI/WebControls/TTextBox.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Prado;
 use Prado\TPropertyValue;
 use Prado\Web\THttpUtility;
 use Prado\Exceptions\TInvalidDataValueException;
diff --git a/framework/Web/UI/WebControls/TTextHighlighter.php b/framework/Web/UI/WebControls/TTextHighlighter.php
index b6a0b46e..37bba1a2 100644
--- a/framework/Web/UI/WebControls/TTextHighlighter.php
+++ b/framework/Web/UI/WebControls/TTextHighlighter.php
@@ -12,6 +12,9 @@
 namespace Prado\Web\UI\WebControls;
 use Prado\TPropertyValue;
 use Prado\Prado;
+use Prado\Web\Javascripts\TJavaScript;
+use Text_Highlighter;
+use Text_Highlighter_Renderer_Html;
 
 // BC trick : only define constants if Text/Highlighter.php
 // is not yet included
@@ -181,7 +184,7 @@ class TTextHighlighter extends TTextProcessor
 	{
 		try
 		{
-			$highlighter=\Prado\Vendor\TextHighlighter\Text\Highlighter::factory($this->getLanguage());
+			$highlighter=Text_Highlighter::factory($this->getLanguage());
 		}
 		catch(\Exception $e)
 		{
diff --git a/framework/Web/UI/WebControls/TValidatorClientSide.php b/framework/Web/UI/WebControls/TValidatorClientSide.php
index c5b87c18..9f59e92a 100644
--- a/framework/Web/UI/WebControls/TValidatorClientSide.php
+++ b/framework/Web/UI/WebControls/TValidatorClientSide.php
@@ -11,6 +11,7 @@
 
 namespace Prado\Web\UI\WebControls;
 use Prado\TPropertyValue;
+use Prado\Web\UI\TClientSideOptions;
 
 /**
  * TValidatorClientSide class.
diff --git a/framework/Web/UI/WebControls/TView.php b/framework/Web/UI/WebControls/TView.php
index 307a0838..2f43391a 100644
--- a/framework/Web/UI/WebControls/TView.php
+++ b/framework/Web/UI/WebControls/TView.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Exceptions\TInvalidOperationException;
 use Prado\TPropertyValue;
 
 /**
diff --git a/framework/Web/UI/WebControls/TWebControlDecorator.php b/framework/Web/UI/WebControls/TWebControlDecorator.php
index c1d6ff1e..63a03e75 100644
--- a/framework/Web/UI/WebControls/TWebControlDecorator.php
+++ b/framework/Web/UI/WebControls/TWebControlDecorator.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Prado;
 use Prado\TPropertyValue;
 
 /**
diff --git a/framework/Web/UI/WebControls/TWizard.php b/framework/Web/UI/WebControls/TWizard.php
index ef068384..9d18ddd8 100644
--- a/framework/Web/UI/WebControls/TWizard.php
+++ b/framework/Web/UI/WebControls/TWizard.php
@@ -10,6 +10,9 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Collections\TStack;
+use Prado\Exceptions\TConfigurationException;
+use Prado\Exceptions\TInvalidOperationException;
 use Prado\TPropertyValue;
 use Prado\Exceptions\TInvalidDataValueException;
 
diff --git a/framework/Web/UI/WebControls/TWizardNavigationTemplate.php b/framework/Web/UI/WebControls/TWizardNavigationTemplate.php
index 9087e99a..e6a3ab9d 100644
--- a/framework/Web/UI/WebControls/TWizardNavigationTemplate.php
+++ b/framework/Web/UI/WebControls/TWizardNavigationTemplate.php
@@ -11,6 +11,7 @@
 
 namespace Prado\Web\UI\WebControls;
 use Prado\Exceptions\TInvalidDataValueException;
+use Prado\Web\UI\ITemplate;
 
 /**
  * TWizardNavigationTemplate class.
diff --git a/framework/Web/UI/WebControls/TWizardSideBarListItemTemplate.php b/framework/Web/UI/WebControls/TWizardSideBarListItemTemplate.php
index 53291a0f..ff41325a 100644
--- a/framework/Web/UI/WebControls/TWizardSideBarListItemTemplate.php
+++ b/framework/Web/UI/WebControls/TWizardSideBarListItemTemplate.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Web\UI\ITemplate;
 
 /**
  * TWizardSideBarListItemTemplate class.
diff --git a/framework/Web/UI/WebControls/TWizardSideBarTemplate.php b/framework/Web/UI/WebControls/TWizardSideBarTemplate.php
index 8572a467..dd50cde9 100644
--- a/framework/Web/UI/WebControls/TWizardSideBarTemplate.php
+++ b/framework/Web/UI/WebControls/TWizardSideBarTemplate.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Web\UI\ITemplate;
 
 /**
  * TWizardSideBarTemplate class.
diff --git a/framework/Web/UI/WebControls/TXmlTransform.php b/framework/Web/UI/WebControls/TXmlTransform.php
index c147b66c..cdaf2a79 100644
--- a/framework/Web/UI/WebControls/TXmlTransform.php
+++ b/framework/Web/UI/WebControls/TXmlTransform.php
@@ -11,7 +11,13 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use DOMDocument;
+use Prado\Collections\TAttributeCollection;
+use Prado\Exceptions\TConfigurationException;
 use Prado\Exceptions\TInvalidDataValueException;
+use Prado\IO\TTextWriter;
+use Prado\Prado;
+use XSLTProcessor;
 
 /**
  * TXmlTransform class
diff --git a/framework/Wsat/TWsatARGenerator.php b/framework/Wsat/TWsatARGenerator.php
index bc2f1335..bece0810 100644
--- a/framework/Wsat/TWsatARGenerator.php
+++ b/framework/Wsat/TWsatARGenerator.php
@@ -11,6 +11,10 @@
 
 namespace Prado\Wsat;
 
+use Exception;
+use PDO;
+use Prado\Prado;
+
 Prado::using("System.Wsat.TWsatBaseGenerator");
 
 class TWsatARGenerator extends TWsatBaseGenerator
diff --git a/framework/Wsat/TWsatBaseGenerator.php b/framework/Wsat/TWsatBaseGenerator.php
index eac7a7de..89ffaac5 100644
--- a/framework/Wsat/TWsatBaseGenerator.php
+++ b/framework/Wsat/TWsatBaseGenerator.php
@@ -11,6 +11,11 @@
 
 namespace Prado\Wsat;
 
+use Exception;
+use Prado\Data\ActiveRecord\TActiveRecordManager;
+use Prado\Data\Common\TDbMetaData;
+use Prado\Prado;
+
 Prado::using('System.Data.Common.TDbMetaData');
 
 class TWsatBaseGenerator
diff --git a/framework/Wsat/TWsatScaffoldingGenerator.php b/framework/Wsat/TWsatScaffoldingGenerator.php
index 0d2e3f9b..4b8b3adb 100644
--- a/framework/Wsat/TWsatScaffoldingGenerator.php
+++ b/framework/Wsat/TWsatScaffoldingGenerator.php
@@ -11,6 +11,8 @@
 
 namespace Prado\Wsat;
 
+use Prado\Prado;
+
 Prado::using("System.Wsat.TWsatBaseGenerator");
 
 class TWsatScaffoldingGenerator extends TWsatBaseGenerator
diff --git a/framework/Wsat/TWsatService.php b/framework/Wsat/TWsatService.php
index ced74fd7..45c814e1 100644
--- a/framework/Wsat/TWsatService.php
+++ b/framework/Wsat/TWsatService.php
@@ -10,6 +10,12 @@
  */
 
 namespace Prado\Wsat;
+use Prado\Exceptions\TConfigurationException;
+use Prado\Exceptions\TInvalidOperationException;
+use Prado\Prado;
+use Prado\TApplicationMode;
+use Prado\Web\Services\TPageService;
+use Prado\Web\UI\TThemeManager;
 
 /**
  * TWsatService class
diff --git a/framework/Wsat/pages/TWsatGenerateAR.php b/framework/Wsat/pages/TWsatGenerateAR.php
index a63ab584..2d77d63d 100644
--- a/framework/Wsat/pages/TWsatGenerateAR.php
+++ b/framework/Wsat/pages/TWsatGenerateAR.php
@@ -11,6 +11,12 @@
 
 namespace Prado\Wsat\pages;
 
+use Exception;
+use Prado\Exceptions\THttpException;
+use Prado\Prado;
+use Prado\Web\UI\TPage;
+use Prado\Wsat\TWsatARGenerator;
+
 Prado::using("System.Wsat.TWsatARGenerator");
 
 class TWsatGenerateAR extends TPage
diff --git a/framework/Wsat/pages/TWsatHome.php b/framework/Wsat/pages/TWsatHome.php
index 3b9829db..0c4535f1 100644
--- a/framework/Wsat/pages/TWsatHome.php
+++ b/framework/Wsat/pages/TWsatHome.php
@@ -11,6 +11,9 @@
 
 namespace Prado\Wsat\pages;
 
+use Prado\Prado;
+use Prado\Web\UI\TPage;
+
 Prado::using("System.Wsat.TWsatARGenerator");
 
 class TWsatHome extends TPage
diff --git a/framework/Wsat/pages/TWsatLogin.php b/framework/Wsat/pages/TWsatLogin.php
index c8a4a7b6..0045e41a 100644
--- a/framework/Wsat/pages/TWsatLogin.php
+++ b/framework/Wsat/pages/TWsatLogin.php
@@ -11,6 +11,8 @@
 
 namespace Prado\Wsat\pages;
 
+use Prado\Web\UI\TPage;
+
 class TWsatLogin extends TPage
 {
 
diff --git a/framework/Wsat/pages/TWsatScaffolding.php b/framework/Wsat/pages/TWsatScaffolding.php
index 0048c250..e2d428ee 100644
--- a/framework/Wsat/pages/TWsatScaffolding.php
+++ b/framework/Wsat/pages/TWsatScaffolding.php
@@ -11,6 +11,12 @@
 
 namespace Prado\Wsat\pages;
 
+use Exception;
+use Prado\Prado;
+use Prado\Web\UI\TPage;
+use Prado\Web\UI\WebControls\TCheckBox;
+use Prado\Wsat\TWsatScaffoldingGenerator;
+
 Prado::using("System.Wsat.TWsatScaffoldingGenerator");
 
 class TWsatScaffolding extends TPage
diff --git a/framework/Wsat/pages/layout/TWsatLayout.php b/framework/Wsat/pages/layout/TWsatLayout.php
index 67caa77d..7b75defe 100644
--- a/framework/Wsat/pages/layout/TWsatLayout.php
+++ b/framework/Wsat/pages/layout/TWsatLayout.php
@@ -1,4 +1,6 @@
 <?php
+use Prado\Web\UI\TTemplateControl;
+use Prado\Wsat\pages\TWsatLogin;
 
 /**
  * Description of MainLayout