Added missing use statements in framework

85 files changed, 319 insertions, 0 deletions

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');
 
 /**