diff --git a/common/framework/parsers/dbquery/column.php b/common/framework/parsers/dbquery/column.php
new file mode 100644
index 000000000..c6eaea342
--- /dev/null
+++ b/common/framework/parsers/dbquery/column.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Rhymix\Framework\Parsers\DBQuery;
+
+/**
+ * Column class.
+ */
+class Column
+{
+	public $name;
+	public $alias;
+	public $is_expression = false;
+	public $is_wildcard = false;
+}
diff --git a/common/framework/parsers/dbquery/condition.php b/common/framework/parsers/dbquery/condition.php
new file mode 100644
index 000000000..b386fb894
--- /dev/null
+++ b/common/framework/parsers/dbquery/condition.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Rhymix\Framework\Parsers\DBQuery;
+
+/**
+ * Condition class.
+ */
+class Condition extends GenericVar
+{
+	public $operation;
+	public $column;
+	public $var;
+	public $default;
+	public $not_null;
+	public $operator = 'AND';
+}
diff --git a/common/framework/parsers/dbquery/conditiongroup.php b/common/framework/parsers/dbquery/conditiongroup.php
new file mode 100644
index 000000000..caee07f1d
--- /dev/null
+++ b/common/framework/parsers/dbquery/conditiongroup.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Rhymix\Framework\Parsers\DBQuery;
+
+/**
+ * Condition Group class.
+ */
+class ConditionGroup
+{
+	public $conditions = array();
+	public $operator = 'AND';
+}
diff --git a/common/framework/parsers/dbquery/genericvar.php b/common/framework/parsers/dbquery/genericvar.php
new file mode 100644
index 000000000..ca6064a13
--- /dev/null
+++ b/common/framework/parsers/dbquery/genericvar.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Rhymix\Framework\Parsers\DBQuery;
+
+/**
+ * GenericVar class.
+ */
+class GenericVar
+{
+	public $var;
+	public $default;
+}
diff --git a/common/framework/parsers/dbquery/groupby.php b/common/framework/parsers/dbquery/groupby.php
new file mode 100644
index 000000000..2b98580b6
--- /dev/null
+++ b/common/framework/parsers/dbquery/groupby.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Rhymix\Framework\Parsers\DBQuery;
+
+/**
+ * GroupBy class.
+ */
+class GroupBy
+{
+	public $columns = array();
+	public $having = array();
+}
diff --git a/common/framework/parsers/dbquery/navigation.php b/common/framework/parsers/dbquery/navigation.php
new file mode 100644
index 000000000..784d05533
--- /dev/null
+++ b/common/framework/parsers/dbquery/navigation.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Rhymix\Framework\Parsers\DBQuery;
+
+/**
+ * Navigation class.
+ */
+class Navigation
+{
+	public $orderby = array();
+	public $list_count;
+	public $page_count;
+	public $page;
+	public $offset;
+}
diff --git a/common/framework/parsers/dbquery/orderby.php b/common/framework/parsers/dbquery/orderby.php
new file mode 100644
index 000000000..0831bc5e1
--- /dev/null
+++ b/common/framework/parsers/dbquery/orderby.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Rhymix\Framework\Parsers\DBQuery;
+
+/**
+ * OrderBy class.
+ */
+class OrderBy extends GenericVar
+{
+	public $var;
+	public $default;
+	public $order_var;
+	public $order_default = 'ASC';
+}
diff --git a/common/framework/parsers/dbquery/query.php b/common/framework/parsers/dbquery/query.php
new file mode 100644
index 000000000..d8f151491
--- /dev/null
+++ b/common/framework/parsers/dbquery/query.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Rhymix\Framework\Parsers\DBQuery;
+
+/**
+ * Query class.
+ */
+class Query
+{
+	public $name;
+	public $alias;
+	public $type;
+	public $tables = array();
+	public $columns = array();
+	public $conditions = array();
+	public $groupby = null;
+	public $navigation = null;
+}
diff --git a/common/framework/parsers/dbquery/table.php b/common/framework/parsers/dbquery/table.php
new file mode 100644
index 000000000..9e5544219
--- /dev/null
+++ b/common/framework/parsers/dbquery/table.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Rhymix\Framework\Parsers\DBQuery;
+
+/**
+ * Table class.
+ */
+class Table
+{
+	public $name;
+	public $alias;
+	public $join_type;
+	public $join_conditions = array();
+}
diff --git a/common/framework/parsers/dbqueryparser.php b/common/framework/parsers/dbqueryparser.php
index eb37dc680..a0fa28e08 100644
--- a/common/framework/parsers/dbqueryparser.php
+++ b/common/framework/parsers/dbqueryparser.php
@@ -2,8 +2,6 @@
 
 namespace Rhymix\Framework\Parsers;
 
-use Rhymix\Framework\Storage;
-
 /**
  * DB query parser class for XE compatibility.
  */
@@ -23,5 +21,177 @@ class DBQueryParser
 		{
 			return false;
 		}
+		
+		// Parse the query.
+		$query_name = preg_replace('/\.xml$/', '', basename($filename));
+		$query = self::_parseQuery($xml, $query_name);
+		
+		return $query;
+	}
+	
+	/**
+	 * Parse a query.
+	 * 
+	 * @param SimpleXMLElement $xml
+	 * @param string $name
+	 * @return object
+	 */
+	protected static function _parseQuery(\SimpleXMLElement $xml, string $name = ''): DBQuery\Query
+	{
+		// Load basic information about this query.
+		$query = new DBQuery\Query;
+		$query->name = $name ?: null;
+		$query->alias = trim($xml['alias']) ?: null;
+		if ($query->alias && !$query->name)
+		{
+			$query->name = $query->alias;
+		}
+		$query->type = trim($xml['action']);
+		
+		// Load tables.
+		foreach ($xml->tables->table as $tag)
+		{
+			if (trim($tag['query']) === 'true')
+			{
+				$table = self::_parseQuery($tag);
+				$query->tables[$table->alias] = $table;
+			}
+			else
+			{
+				$table = new DBQuery\Table;
+				$table->name = trim($tag['name']);
+				$table->alias = trim($tag['alias']) ?: $table->name;
+				$table_type = trim($tag['type']);
+				if (stripos($table_type, 'join') !== false)
+				{
+					$table->join_type = strtoupper($table_type);
+					if ($tag->conditions)
+					{
+						$table->join_conditions = self::_parseConditions($tag->conditions);
+					}
+				}
+				$query->tables[$table->alias] = $table;
+			}
+		}
+		
+		// Load columns.
+		foreach ($xml->columns->column as $tag)
+		{
+			$column = new DBQuery\Column;
+			$column->name = trim($tag['name']);
+			$column->alias = trim($tag['alias']) ?: null;
+			if ($column->name === '*' || preg_match('/\.\*$/', $column->name))
+			{
+				$column->is_wildcard = true;
+			}
+			if (!self::_isValidColumnName($column->name))
+			{
+				$column->is_expression = true;
+			}
+			$query->columns[] = $column;
+		}
+		
+		// Load conditions.
+		if ($xml->conditions)
+		{
+			$query->conditions = self::_parseConditions($xml->conditions);
+		}
+		
+		// Load groups.
+		if ($xml->groups)
+		{
+			$query->groupby = new DBQuery\GroupBy;
+			foreach ($xml->groups->children() as $tag)
+			{
+				$name = $tag->getName();
+				if ($name === 'group')
+				{
+					$query->groupby->columns[] = trim($tag['column']);
+				}
+				elseif ($name === 'having')
+				{
+					$query->groupby->having = self::_parseConditions($tag);
+				}
+			}
+		}
+		
+		// Load navigation settings.
+		if ($xml->navigation)
+		{
+			$query->navigation = new DBQuery\Navigation;
+			foreach ($xml->navigation->index as $tag)
+			{
+				$orderby = new DBQuery\OrderBy;
+				$orderby->var = trim($tag['var']) ?: null;
+				$orderby->default = trim($tag['default']) ?: null;
+				$orderby->order_var = trim($tag['order']) ?: null;
+				$query->navigation->orderby[] = $orderby;
+			}
+			foreach (['list_count', 'page_count', 'page', 'offset'] as $key)
+			{
+				if ($tag = $xml->navigation->{$key})
+				{
+					$query->navigation->{$key} = new DBQuery\GenericVar;
+					$query->navigation->{$key}->var = trim($tag['var']) ?: null;
+					$query->navigation->{$key}->default = trim($tag['default']) ?: null;
+				}
+			}
+		}
+		
+		// Return the complete query definition.
+		return $query;
+	}
+	
+	/**
+	 * Parse conditions.
+	 * 
+	 * @param SimpleXMLElement $parent
+	 * @return array
+	 */
+	protected static function _parseConditions(\SimpleXMLElement $parent): array
+	{
+		$result = array();
+		foreach ($parent->children() as $tag)
+		{
+			$name = $tag->getName();
+			if ($name === 'condition')
+			{
+				$cond = new DBQuery\Condition;
+				$cond->operation = trim($tag['operation']);
+				$cond->column = trim($tag['column']);
+				$cond->var = trim($tag['var']);
+				$cond->default = trim($tag['default']);
+				$cond->not_null = trim($tag['notnull'] ?: $tag['not-null']) !== '' ? true : false;
+				$cond->operator = strtoupper($tag['pipe']) ?: 'AND';
+				$result[] = $cond;
+			}
+			elseif ($name === 'group')
+			{
+				$group = new DBQuery\ConditionGroup;
+				$group->conditions = self::_parseConditions($tag);
+				$group->operator = strtoupper($tag['pipe']) ?: 'AND';
+				$result[] = $group;
+			}
+		}
+		
+		return $result;
+	}
+	
+	/**
+	 * Check if an expression might be a valid column name.
+	 * 
+	 * @param string $column_name
+	 * @return bool
+	 */
+	protected static function _isValidColumnName(string $column_name): bool
+	{
+		if (preg_match('/^[a-z0-9_]+(?:\.[a-z0-9_]+)*$/', $column_name))
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
 	}
 }
diff --git a/common/framework/parsers/dbtableparser.php b/common/framework/parsers/dbtableparser.php
index 5078357e2..3fda78870 100644
--- a/common/framework/parsers/dbtableparser.php
+++ b/common/framework/parsers/dbtableparser.php
@@ -2,8 +2,6 @@
 
 namespace Rhymix\Framework\Parsers;
 
-use Rhymix\Framework\Storage;
-
 /**
  * DB table parser class for XE compatibility.
  */
@@ -35,10 +33,6 @@ class DBTableParser
 	 */
 	public static function loadXML(string $filename)
 	{
-		// Initialize table definition.
-		$table = new DBTable\Table;
-		$table->name = preg_replace('/\.xml$/', '', basename($filename));
-		
 		// Load the XML file.
 		$xml = simplexml_load_string(file_get_contents($filename));
 		if ($xml === false)
@@ -46,6 +40,10 @@ class DBTableParser
 			return false;
 		}
 		
+		// Initialize table definition.
+		$table = new DBTable\Table;
+		$table->name = preg_replace('/\.xml$/', '', basename($filename));
+		
 		// Load columns.
 		foreach ($xml->column as $column_info)
 		{