diff --git a/classes/db/DB.class.php b/classes/db/DB.class.php
index dda455029..2ec5b8991 100644
--- a/classes/db/DB.class.php
+++ b/classes/db/DB.class.php
@@ -21,7 +21,6 @@
         require(_XE_PATH_.'classes/xml/xmlquery/argument/Argument.class.php');
         require(_XE_PATH_.'classes/xml/xmlquery/argument/SortArgument.class.php');
         require(_XE_PATH_.'classes/xml/xmlquery/argument/ConditionArgument.class.php');
-        require(_XE_PATH_.'classes/xml/XmlQueryParser.class.php');
 
         require(_XE_PATH_.'classes/db/queryparts/expression/Expression.class.php');
         require(_XE_PATH_.'classes/db/queryparts/expression/SelectExpression.class.php');
@@ -76,7 +75,7 @@
         var $cache_file = 'files/cache/queries/'; ///< location of query cache
 
 		var $db_type; ///< stores database type: 'mysql','cubrid','mssql' etc. or 'db' when database is not yet set
-		
+
         /**
          * @brief returns instance of certain db type
          * @param[in] $db_type type of db
diff --git a/classes/db/queryparts/Query.class.php b/classes/db/queryparts/Query.class.php
index a294702b8..6d83907bc 100644
--- a/classes/db/queryparts/Query.class.php
+++ b/classes/db/queryparts/Query.class.php
@@ -51,7 +51,7 @@
                         $this->columnList = $columnList;
                         if(count($this->columnList) > 0) {
                             $selectColumns = array();
-                            $dbParser = XmlQueryParser::getDBParser();
+                            $dbParser = DB::getParser();
 
                             foreach($this->columnList as $columnName){
                                     $columnName = $dbParser->escapeColumn($columnName);
diff --git a/classes/xml/xmlquery/argument/Argument.class.php b/classes/xml/xmlquery/argument/Argument.class.php
index b7affe15a..1fe6a7409 100644
--- a/classes/xml/xmlquery/argument/Argument.class.php
+++ b/classes/xml/xmlquery/argument/Argument.class.php
@@ -63,7 +63,7 @@
 
 		function escapeValue($value){
                         if($this->getType() == 'column_name'){
-				$dbParser = XmlQueryParser::getDBParser();
+				$dbParser = DB::getParser();
 				return $dbParser->parseExpression($value);
                         }
                         if(!isset($value)) return null;
diff --git a/classes/xml/xmlquery/queryargument/DefaultValue.class.php b/classes/xml/xmlquery/queryargument/DefaultValue.class.php
index 3ee5d4358..1954030e4 100644
--- a/classes/xml/xmlquery/queryargument/DefaultValue.class.php
+++ b/classes/xml/xmlquery/queryargument/DefaultValue.class.php
@@ -8,7 +8,7 @@
                 var $operation = '';
 
 		function DefaultValue($column_name, $value){
-                        $dbParser = &XmlQueryParser::getDBParser();
+                        $dbParser = &DB::getParser();
 			$this->column_name = $dbParser->parseColumnName($column_name);
 			$this->value = $value;
                         $this->value = $this->_setValue();
diff --git a/classes/xml/xmlquery/tags/column/InsertColumnTag.class.php b/classes/xml/xmlquery/tags/column/InsertColumnTag.class.php
index 18bb4b2de..586125f42 100644
--- a/classes/xml/xmlquery/tags/column/InsertColumnTag.class.php
+++ b/classes/xml/xmlquery/tags/column/InsertColumnTag.class.php
@@ -12,7 +12,7 @@
 
 		function InsertColumnTag($column) {
 			parent::ColumnTag($column->attrs->name);
-			$dbParser = XmlQueryParser::getDBParser();
+			$dbParser = DB::getParser();
 			$this->name = $dbParser->parseColumnName($this->name);
 			$this->argument = new QueryArgument($column);
 		}
diff --git a/classes/xml/xmlquery/tags/column/SelectColumnTag.class.php b/classes/xml/xmlquery/tags/column/SelectColumnTag.class.php
index 61031dfcc..53012641c 100644
--- a/classes/xml/xmlquery/tags/column/SelectColumnTag.class.php
+++ b/classes/xml/xmlquery/tags/column/SelectColumnTag.class.php
@@ -15,7 +15,7 @@
 			parent::ColumnTag($column->attrs->name);
 			if(!$this->name) $this->name = "*";			
 			if($this->name != "*") {
-				$dbParser = XmlQueryParser::getDBParser();
+				$dbParser = DB::getParser();
 				$this->name = $dbParser->parseExpression($this->name);
 			}
 				
@@ -27,7 +27,7 @@
 			if($this->name == '*') return "new StarExpression()";
 			if($this->click_count)
 				return sprintf('new ClickCountExpression(%s, %s, $args->%s)', $this->name, $this->alias,$this->click_count);
-			$dbParser = XmlQueryParser::getDBParser();
+			$dbParser = DB::getParser();
 			return sprintf('new SelectExpression(\'%s\'%s)', $this->name, $this->alias ? ', \''.$dbParser->escape($this->alias) .'\'': '');	
 		}
 	}
diff --git a/classes/xml/xmlquery/tags/column/UpdateColumnTag.class.php b/classes/xml/xmlquery/tags/column/UpdateColumnTag.class.php
index 147c7bbe5..45aeb073b 100644
--- a/classes/xml/xmlquery/tags/column/UpdateColumnTag.class.php
+++ b/classes/xml/xmlquery/tags/column/UpdateColumnTag.class.php
@@ -14,7 +14,7 @@
 
 		function UpdateColumnTag($column) {
 			parent::ColumnTag($column->attrs->name);
-			$dbParser = XmlQueryParser::getDBParser();
+			$dbParser = DB::getParser();
 			$this->name = $dbParser->parseColumnName($this->name);
 			$this->argument = new QueryArgument($column);
 		}
diff --git a/classes/xml/xmlquery/tags/condition/ConditionTag.class.php b/classes/xml/xmlquery/tags/condition/ConditionTag.class.php
index 66349ec4b..6545d733d 100644
--- a/classes/xml/xmlquery/tags/condition/ConditionTag.class.php
+++ b/classes/xml/xmlquery/tags/condition/ConditionTag.class.php
@@ -20,7 +20,7 @@
 		function ConditionTag($condition){
 			$this->operation = $condition->attrs->operation;
 			$this->pipe = $condition->attrs->pipe;
-			$dbParser = XmlQueryParser::getDBParser();
+			$dbParser = DB::getParser();
 			$this->column_name = $dbParser->parseColumnName($condition->attrs->column);
 
 			$isColumnName = strpos($condition->attrs->default, '.');
diff --git a/classes/xml/xmlquery/tags/group/GroupsTag.class.php b/classes/xml/xmlquery/tags/group/GroupsTag.class.php
index 19f74fe43..620f3c5f6 100644
--- a/classes/xml/xmlquery/tags/group/GroupsTag.class.php
+++ b/classes/xml/xmlquery/tags/group/GroupsTag.class.php
@@ -9,7 +9,7 @@
             if($xml_groups) {
                 if(!is_array($xml_groups)) $xml_groups = array($xml_groups);
                 
-                $dbParser = XmlQueryParser::getDBParser();
+                $dbParser = DB::getParser();
                 for($i=0;$i<count($xml_groups);$i++) {
                     $group = $xml_groups[$i];
                     $column = trim($group->attrs->column);
diff --git a/classes/xml/xmlquery/tags/navigation/IndexTag.class.php b/classes/xml/xmlquery/tags/navigation/IndexTag.class.php
index e12fe1c7b..86408de2a 100644
--- a/classes/xml/xmlquery/tags/navigation/IndexTag.class.php
+++ b/classes/xml/xmlquery/tags/navigation/IndexTag.class.php
@@ -11,7 +11,7 @@
 			$this->argument_name = $index->attrs->var;
 
                         // Sort index - column by which to sort
-			//$dbParser = XmlQueryParser::getDBParser();
+			//$dbParser = DB::getParser();
 			//$index->attrs->default = $dbParser->parseExpression($index->attrs->default);
 			$this->default = $index->attrs->default;
 			$this->argument = new QueryArgument($index);
diff --git a/classes/xml/xmlquery/tags/table/TableTag.class.php b/classes/xml/xmlquery/tags/table/TableTag.class.php
index 8fe35ff6f..0fe59c23d 100644
--- a/classes/xml/xmlquery/tags/table/TableTag.class.php
+++ b/classes/xml/xmlquery/tags/table/TableTag.class.php
@@ -30,7 +30,7 @@
                  * @param XML <table> tag $table
                  */
 		function TableTag($table){
-			$dbParser = XmlQueryParser::getDBParser();
+			$dbParser = DB::getParser();
                         
                         $this->unescaped_name = $table->attrs->name;
 			$this->name = $dbParser->parseTableName($table->attrs->name);
@@ -67,7 +67,7 @@
                  * @return string 
                  */
 		function getTableString(){
-			$dbParser = XmlQueryParser::getDBParser();
+			$dbParser = DB::getParser();
 			if($this->isJoinTable()){
 				return sprintf('new JoinTable(\'%s\', \'%s\', "%s", %s)'
 								, $dbParser->escape($this->name)
diff --git a/test-phpUnit/db/CubridOnlineTest.php b/test-phpUnit/db/CubridOnlineTest.php
index d51353e1a..08037d02d 100644
--- a/test-phpUnit/db/CubridOnlineTest.php
+++ b/test-phpUnit/db/CubridOnlineTest.php
@@ -35,7 +35,7 @@
             // remove cache dir
             FileHandler::removeDir( _XE_PATH_ . 'files/cache');
 
-            XmlQueryParser::getDBParser(true);
+            DB::getParser(true);
         }
 
         /**
diff --git a/test-phpUnit/db/CubridTest.php b/test-phpUnit/db/CubridTest.php
index ee62a6dc0..7eb3a986f 100644
--- a/test-phpUnit/db/CubridTest.php
+++ b/test-phpUnit/db/CubridTest.php
@@ -16,7 +16,7 @@
             $db_info->slave_db = array(array('db_type' => 'cubrid','db_table_prefix' => 'xe_'));
 
             $oContext->setDbInfo($db_info);
-            XmlQueryParser::getDBParser(true);
+            DB::getParser(true);
         }
 
         /**
diff --git a/test-phpUnit/db/MssqlOnlineTest.php b/test-phpUnit/db/MssqlOnlineTest.php
index 1f5084220..07f356aa0 100644
--- a/test-phpUnit/db/MssqlOnlineTest.php
+++ b/test-phpUnit/db/MssqlOnlineTest.php
@@ -35,7 +35,7 @@
             // remove cache dir
             FileHandler::removeDir( _XE_PATH_ . 'files/cache');
 
-            XmlQueryParser::getDBParser(true);
+            DB::getParser(true);
         }
 
         /**
diff --git a/test-phpUnit/db/MssqlTest.php b/test-phpUnit/db/MssqlTest.php
index 58f99ffa9..6e9f5392d 100644
--- a/test-phpUnit/db/MssqlTest.php
+++ b/test-phpUnit/db/MssqlTest.php
@@ -15,7 +15,7 @@
 
             $oContext->setDbInfo($db_info);
 
-            XmlQueryParser::getDBParser(true);
+            DB::getParser(true);
         }
 
         protected function tearDown() {