diff --git a/docs/classes.svg b/docs/classes.svg
index dbca735..e33786e 100644
--- a/docs/classes.svg
+++ b/docs/classes.svg
@@ -74,15 +74,15 @@
 <text text-anchor="start" x="205" y="-1520.23" font-family="Courier,monospace" font-size="11.00">DB_Util</text>
 </a>
 </g>
-<!-- \\pgSQL_SQL -->
-<g id="node8" class="node"><title>\\pgSQL_SQL</title>
-<a xlink:href="sys.db.drivers.pgsql.pgsql_sql.html" xlink:title="pgSQL_SQL" target="_parent">
+<!-- \\PgSQL_SQL -->
+<g id="node8" class="node"><title>\\PgSQL_SQL</title>
+<a xlink:href="sys.db.drivers.pgsql.pgsql_sql.html" xlink:title="PgSQL_SQL" target="_parent">
 <polygon fill="none" stroke="black" points="493,-1384 417,-1384 417,-1348 493,-1348 493,-1384"/>
-<text text-anchor="middle" x="455" y="-1362.6" font-family="Courier,monospace" font-size="11.00">pgSQL_SQL</text>
+<text text-anchor="middle" x="455" y="-1362.6" font-family="Courier,monospace" font-size="11.00">PgSQL_SQL</text>
 </a>
 </g>
-<!-- \\pgSQL_SQL&#45;&gt;\\DB_SQL -->
-<g id="edge5" class="edge"><title>\\pgSQL_SQL&#45;&gt;\\DB_SQL</title>
+<!-- \\PgSQL_SQL&#45;&gt;\\DB_SQL -->
+<g id="edge5" class="edge"><title>\\PgSQL_SQL&#45;&gt;\\DB_SQL</title>
 <path fill="none" stroke="black" d="M416.385,-1351.7C406.402,-1347.78 395.729,-1343.4 386,-1339 346.066,-1320.94 301.797,-1297.81 270.474,-1280.89"/>
 <polygon fill="none" stroke="black" points="272.052,-1277.76 261.593,-1276.07 268.714,-1283.92 272.052,-1277.76"/>
 </g>
@@ -98,15 +98,15 @@
 <path fill="none" stroke="black" d="M412.749,-1620.27C403.844,-1616.73 394.556,-1612.87 386,-1609 346.066,-1590.94 301.797,-1567.81 270.474,-1550.89"/>
 <polygon fill="none" stroke="black" points="272.052,-1547.76 261.593,-1546.07 268.714,-1553.92 272.052,-1547.76"/>
 </g>
-<!-- \\pgSQL -->
-<g id="node10" class="node"><title>\\pgSQL</title>
-<a xlink:href="sys.db.drivers.pgsql.pgsql_driver.html" xlink:title="pgSQL" target="_parent">
+<!-- \\PgSQL -->
+<g id="node10" class="node"><title>\\PgSQL</title>
+<a xlink:href="sys.db.drivers.pgsql.pgsql_driver.html" xlink:title="PgSQL" target="_parent">
 <polygon fill="none" stroke="black" points="482,-1114 428,-1114 428,-1078 482,-1078 482,-1114"/>
-<text text-anchor="middle" x="455" y="-1092.6" font-family="Courier,monospace" font-size="11.00">pgSQL</text>
+<text text-anchor="middle" x="455" y="-1092.6" font-family="Courier,monospace" font-size="11.00">PgSQL</text>
 </a>
 </g>
-<!-- \\pgSQL&#45;&gt;\\DB_PDO -->
-<g id="edge9" class="edge"><title>\\pgSQL&#45;&gt;\\DB_PDO</title>
+<!-- \\PgSQL&#45;&gt;\\DB_PDO -->
+<g id="edge9" class="edge"><title>\\PgSQL&#45;&gt;\\DB_PDO</title>
 <path fill="none" stroke="black" d="M427.862,-1086.12C415.038,-1081.27 399.597,-1075.15 386,-1069 346.066,-1050.94 301.797,-1027.81 270.474,-1010.89"/>
 <polygon fill="none" stroke="black" points="272.052,-1007.76 261.593,-1006.07 268.714,-1013.92 272.052,-1007.76"/>
 </g>
diff --git a/docs/classes/Add_DB.html b/docs/classes/Add_DB.html
index 798b549..28bdb84 100644
--- a/docs/classes/Add_DB.html
+++ b/docs/classes/Add_DB.html
@@ -18,7 +18,12 @@
 <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
 <li class="dropdown">
 <a href="#api" class="dropdown-toggle" data-toggle="dropdown">
-                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu"></ul>
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
 </li>
 <li class="dropdown" id="charts-menu">
 <a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
@@ -60,6 +65,16 @@
 <p class="short_description">Window controlling addition of database connections</p>
 <div class="details">
 <p class="long_description"></p>
+<table class="table table-bordered">
+<tr>
+<th>package</th>
+<td><a href="..//packages/OpenSQLManager.Windows.html">OpenSQLManager</a></td>
+</tr>
+<tr>
+<th>subpackage</th>
+<td>Windows</td>
+</tr>
+</table>
 <h3>
 <i class="icon-custom icon-method"></i> Methods</h3>
 <a name="__construct" id="__construct"></a><div class="element clickable method public __construct" data-toggle="collapse" data-target=".__construct .collapse">
@@ -75,7 +90,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-19T12:28:55-04:00.<br></footer></div>
+            generated on 2012-04-20T13:27:44-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/Connection_Sidebar.html b/docs/classes/Connection_Sidebar.html
index 4c5ed64..a070aad 100644
--- a/docs/classes/Connection_Sidebar.html
+++ b/docs/classes/Connection_Sidebar.html
@@ -18,7 +18,12 @@
 <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
 <li class="dropdown">
 <a href="#api" class="dropdown-toggle" data-toggle="dropdown">
-                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu"></ul>
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
 </li>
 <li class="dropdown" id="charts-menu">
 <a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
@@ -84,6 +89,16 @@
 <p class="short_description">Widget managing saved database connections</p>
 <div class="details">
 <p class="long_description"></p>
+<table class="table table-bordered">
+<tr>
+<th>package</th>
+<td><a href="..//packages/OpenSQLManager.Widgets.html">OpenSQLManager</a></td>
+</tr>
+<tr>
+<th>subpackage</th>
+<td>Widgets</td>
+</tr>
+</table>
 <h3>
 <i class="icon-custom icon-method"></i> Methods</h3>
 <a name="__construct" id="__construct"></a><div class="element clickable method public __construct" data-toggle="collapse" data-target=".__construct .collapse">
@@ -271,31 +286,31 @@
 <i class="icon-custom icon-property"></i> Properties</h3>
 <a name="%24menu" id="$menu"> </a><div class="element clickable property protected $menu" data-toggle="collapse" data-target=".$menu .collapse">
 <h2>Reference to popup menu</h2>
-<pre>$menu </pre>
+<pre>$menu : \GtkMenu</pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
 </div>
 <a name="%24settings" id="$settings"> </a><div class="element clickable property protected $settings" data-toggle="collapse" data-target=".$settings .collapse">
 <h2>Reference to Settings instance</h2>
-<pre>$settings </pre>
+<pre>$settings : <a href="../classes/Settings.html">\Settings</a></pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
 </div>
 <a name="%24treeview" id="$treeview"> </a><div class="element clickable property protected $treeview" data-toggle="collapse" data-target=".$treeview .collapse">
 <h2>Treeview for displaying connections</h2>
-<pre>$treeview </pre>
+<pre>$treeview : \GtkTreeView</pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
 </div>
 <a name="%24conn_name" id="$conn_name"> </a><div class="element clickable property private $conn_name" data-toggle="collapse" data-target=".$conn_name .collapse">
 <h2>Name of current db connection</h2>
-<pre>$conn_name </pre>
+<pre>$conn_name : string</pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
 </div>
 <a name="%24instance" id="$instance"> </a><div class="element clickable property private $instance" data-toggle="collapse" data-target=".$instance .collapse">
 <h2>Singleton instance</h2>
-<pre>$instance </pre>
+<pre>$instance : <a href="../classes/Connection_Sidebar.html">\Connection_Sidebar</a></pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
 </div>
@@ -306,7 +321,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-19T12:28:55-04:00.<br></footer></div>
+            generated on 2012-04-20T13:27:44-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/DB_Info_Widget.html b/docs/classes/DB_Info_Widget.html
index e5ecdb8..76c8437 100644
--- a/docs/classes/DB_Info_Widget.html
+++ b/docs/classes/DB_Info_Widget.html
@@ -18,7 +18,12 @@
 <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
 <li class="dropdown">
 <a href="#api" class="dropdown-toggle" data-toggle="dropdown">
-                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu"></ul>
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
 </li>
 <li class="dropdown" id="charts-menu">
 <a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
@@ -70,15 +75,14 @@
 <li class="property protected "><a href="#%24db_file" title="$db_file :: Connection database file"><span class="description">Connection database file</span><pre>$db_file</pre></a></li>
 <li class="property protected "><a href="#%24dbtype" title="$dbtype :: Connection database type"><span class="description">Connection database type</span><pre>$dbtype</pre></a></li>
 <li class="property protected "><a href="#%24host" title="$host :: Connection database host"><span class="description">Connection database host</span><pre>$host</pre></a></li>
-<li class="property protected "><a href="#%24lblconn" title="$lblconn :: Labels"><span class="description">Labels</span><pre>$lblconn</pre></a></li>
-<li class="property protected "><a href="#%24lblconn_db" title="$lblconn_db :: Labels"><span class="description">Labels</span><pre>$lblconn_db</pre></a></li>
-<li class="property protected "><a href="#%24lbldatabase" title="$lbldatabase :: Labels"><span class="description">Labels</span><pre>$lbldatabase</pre></a></li>
-<li class="property protected "><a href="#%24lbldb_file" title="$lbldb_file :: Labels"><span class="description">Labels</span><pre>$lbldb_file</pre></a></li>
-<li class="property protected "><a href="#%24lbldbtype" title="$lbldbtype :: Labels"><span class="description">Labels</span><pre>$lbldbtype</pre></a></li>
-<li class="property protected "><a href="#%24lblhost" title="$lblhost :: Labels"><span class="description">Labels</span><pre>$lblhost</pre></a></li>
-<li class="property protected "><a href="#%24lblpass" title="$lblpass :: Labels"><span class="description">Labels</span><pre>$lblpass</pre></a></li>
-<li class="property protected "><a href="#%24lblport" title="$lblport :: Labels"><span class="description">Labels</span><pre>$lblport</pre></a></li>
-<li class="property protected "><a href="#%24lbluser" title="$lbluser :: Labels"><span class="description">Labels</span><pre>$lbluser</pre></a></li>
+<li class="property protected "><a href="#%24lblconn" title="$lblconn :: Label for connection name"><span class="description">Label for connection name</span><pre>$lblconn</pre></a></li>
+<li class="property protected "><a href="#%24lblconn_db" title="$lblconn_db :: Label for connection database name"><span class="description">Label for connection database name</span><pre>$lblconn_db</pre></a></li>
+<li class="property protected "><a href="#%24lbldb_file" title="$lbldb_file :: Label for database file"><span class="description">Label for database file</span><pre>$lbldb_file</pre></a></li>
+<li class="property protected "><a href="#%24lbldbtype" title="$lbldbtype :: Label for database type"><span class="description">Label for database type</span><pre>$lbldbtype</pre></a></li>
+<li class="property protected "><a href="#%24lblhost" title="$lblhost :: Label for database host"><span class="description">Label for database host</span><pre>$lblhost</pre></a></li>
+<li class="property protected "><a href="#%24lblpass" title="$lblpass :: Label for database connection password"><span class="description">Label for database connection password</span><pre>$lblpass</pre></a></li>
+<li class="property protected "><a href="#%24lblport" title="$lblport :: Label for database connection port"><span class="description">Label for database connection port</span><pre>$lblport</pre></a></li>
+<li class="property protected "><a href="#%24lbluser" title="$lbluser :: Label for database connection user"><span class="description">Label for database connection user</span><pre>$lbluser</pre></a></li>
 <li class="property protected "><a href="#%24old_conn" title="$old_conn :: Reference to last connection name"><span class="description">Reference to last connection name</span><pre>$old_conn</pre></a></li>
 <li class="property protected "><a href="#%24pass" title="$pass :: Connection password"><span class="description">Connection password</span><pre>$pass</pre></a></li>
 <li class="property protected "><a href="#%24port" title="$port :: Connection port"><span class="description">Connection port</span><pre>$port</pre></a></li>
@@ -92,11 +96,21 @@
 <p class="short_description">Widget for adding / editing database connections</p>
 <div class="details">
 <p class="long_description"></p>
+<table class="table table-bordered">
+<tr>
+<th>package</th>
+<td><a href="..//packages/OpenSQLManager.Widgets.html">OpenSQLManager</a></td>
+</tr>
+<tr>
+<th>subpackage</th>
+<td>Widgets</td>
+</tr>
+</table>
 <h3>
 <i class="icon-custom icon-method"></i> Methods</h3>
 <a name="__construct" id="__construct"></a><div class="element clickable method public __construct" data-toggle="collapse" data-target=".__construct .collapse">
 <h2>No params = add, params = edit</h2>
-<pre>__construct(object $db) </pre>
+<pre>__construct(object $db) : void</pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8">
 <p class="long_description"></p>
@@ -182,109 +196,103 @@
 <i class="icon-custom icon-property"></i> Properties</h3>
 <a name="%24conn" id="$conn"> </a><div class="element clickable property protected $conn" data-toggle="collapse" data-target=".$conn .collapse">
 <h2>Connection name</h2>
-<pre>$conn </pre>
+<pre>$conn : \GtkEntry</pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
 </div>
 <a name="%24conn_db" id="$conn_db"> </a><div class="element clickable property protected $conn_db" data-toggle="collapse" data-target=".$conn_db .collapse">
 <h2>Connection database name</h2>
-<pre>$conn_db </pre>
+<pre>$conn_db : \GtkEntry</pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
 </div>
 <a name="%24db_file" id="$db_file"> </a><div class="element clickable property protected $db_file" data-toggle="collapse" data-target=".$db_file .collapse">
 <h2>Connection database file</h2>
-<pre>$db_file </pre>
+<pre>$db_file : \GtkFileChooserButton</pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
 </div>
 <a name="%24dbtype" id="$dbtype"> </a><div class="element clickable property protected $dbtype" data-toggle="collapse" data-target=".$dbtype .collapse">
 <h2>Connection database type</h2>
-<pre>$dbtype </pre>
+<pre>$dbtype : \GtkComboBox</pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
 </div>
 <a name="%24host" id="$host"> </a><div class="element clickable property protected $host" data-toggle="collapse" data-target=".$host .collapse">
 <h2>Connection database host</h2>
-<pre>$host </pre>
+<pre>$host : \GtkEntry</pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
 </div>
 <a name="%24lblconn" id="$lblconn"> </a><div class="element clickable property protected $lblconn" data-toggle="collapse" data-target=".$lblconn .collapse">
-<h2>Labels</h2>
-<pre>$lblconn </pre>
+<h2>Label for connection name</h2>
+<pre>$lblconn : \GtkLabel</pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
 </div>
 <a name="%24lblconn_db" id="$lblconn_db"> </a><div class="element clickable property protected $lblconn_db" data-toggle="collapse" data-target=".$lblconn_db .collapse">
-<h2>Labels</h2>
-<pre>$lblconn_db </pre>
-<div class="labels"></div>
-<div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
-</div>
-<a name="%24lbldatabase" id="$lbldatabase"> </a><div class="element clickable property protected $lbldatabase" data-toggle="collapse" data-target=".$lbldatabase .collapse">
-<h2>Labels</h2>
-<pre>$lbldatabase </pre>
+<h2>Label for connection database name</h2>
+<pre>$lblconn_db : \Gtklabel</pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
 </div>
 <a name="%24lbldb_file" id="$lbldb_file"> </a><div class="element clickable property protected $lbldb_file" data-toggle="collapse" data-target=".$lbldb_file .collapse">
-<h2>Labels</h2>
-<pre>$lbldb_file </pre>
+<h2>Label for database file</h2>
+<pre>$lbldb_file : \GtkLabel</pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
 </div>
 <a name="%24lbldbtype" id="$lbldbtype"> </a><div class="element clickable property protected $lbldbtype" data-toggle="collapse" data-target=".$lbldbtype .collapse">
-<h2>Labels</h2>
-<pre>$lbldbtype </pre>
+<h2>Label for database type</h2>
+<pre>$lbldbtype : \Gtklabel</pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
 </div>
 <a name="%24lblhost" id="$lblhost"> </a><div class="element clickable property protected $lblhost" data-toggle="collapse" data-target=".$lblhost .collapse">
-<h2>Labels</h2>
-<pre>$lblhost </pre>
+<h2>Label for database host</h2>
+<pre>$lblhost : \Gtklabel</pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
 </div>
 <a name="%24lblpass" id="$lblpass"> </a><div class="element clickable property protected $lblpass" data-toggle="collapse" data-target=".$lblpass .collapse">
-<h2>Labels</h2>
-<pre>$lblpass </pre>
+<h2>Label for database connection password</h2>
+<pre>$lblpass : \GtkLabel</pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
 </div>
 <a name="%24lblport" id="$lblport"> </a><div class="element clickable property protected $lblport" data-toggle="collapse" data-target=".$lblport .collapse">
-<h2>Labels</h2>
-<pre>$lblport </pre>
+<h2>Label for database connection port</h2>
+<pre>$lblport : \GtkLabel</pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
 </div>
 <a name="%24lbluser" id="$lbluser"> </a><div class="element clickable property protected $lbluser" data-toggle="collapse" data-target=".$lbluser .collapse">
-<h2>Labels</h2>
-<pre>$lbluser </pre>
+<h2>Label for database connection user</h2>
+<pre>$lbluser : \GtkLabel</pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
 </div>
 <a name="%24old_conn" id="$old_conn"> </a><div class="element clickable property protected $old_conn" data-toggle="collapse" data-target=".$old_conn .collapse">
 <h2>Reference to last connection name</h2>
-<pre>$old_conn </pre>
+<pre>$old_conn : string</pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
 </div>
 <a name="%24pass" id="$pass"> </a><div class="element clickable property protected $pass" data-toggle="collapse" data-target=".$pass .collapse">
 <h2>Connection password</h2>
-<pre>$pass </pre>
+<pre>$pass : \GtkEntry</pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
 </div>
 <a name="%24port" id="$port"> </a><div class="element clickable property protected $port" data-toggle="collapse" data-target=".$port .collapse">
 <h2>Connection port</h2>
-<pre>$port </pre>
+<pre>$port : \GtkEntry</pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
 </div>
 <a name="%24user" id="$user"> </a><div class="element clickable property protected $user" data-toggle="collapse" data-target=".$user .collapse">
 <h2>Connection user name</h2>
-<pre>$user </pre>
+<pre>$user : \GtkEntry</pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
 </div>
@@ -301,7 +309,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-19T12:28:55-04:00.<br></footer></div>
+            generated on 2012-04-20T13:27:44-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/DB_PDO.html b/docs/classes/DB_PDO.html
index d0aac79..d32804e 100644
--- a/docs/classes/DB_PDO.html
+++ b/docs/classes/DB_PDO.html
@@ -18,7 +18,12 @@
 <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
 <li class="dropdown">
 <a href="#api" class="dropdown-toggle" data-toggle="dropdown">
-                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu"></ul>
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
 </li>
 <li class="dropdown" id="charts-menu">
 <a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
@@ -124,6 +129,16 @@ the connection/database</span><pre>get_system_tables()</pre></a></li>
 <p class="short_description">Base Database class</p>
 <div class="details">
 <p class="long_description"><p>Extends PDO to simplify cross-database issues</p></p>
+<table class="table table-bordered">
+<tr>
+<th>package</th>
+<td><a href="..//packages/Query.Query.html">Query</a></td>
+</tr>
+<tr>
+<th>subpackage</th>
+<td>Query</td>
+</tr>
+</table>
 <h3>
 <i class="icon-custom icon-method"></i> Methods</h3>
 <a name="__construct" id="__construct"></a><div class="element clickable method public __construct" data-toggle="collapse" data-target=".__construct .collapse">
@@ -648,7 +663,7 @@ the connection/database</h2>
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-19T12:28:55-04:00.<br></footer></div>
+            generated on 2012-04-20T13:27:44-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/DB_Reg.html b/docs/classes/DB_Reg.html
index 772ca58..4caae61 100644
--- a/docs/classes/DB_Reg.html
+++ b/docs/classes/DB_Reg.html
@@ -18,7 +18,12 @@
 <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
 <li class="dropdown">
 <a href="#api" class="dropdown-toggle" data-toggle="dropdown">
-                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu"></ul>
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
 </li>
 <li class="dropdown" id="charts-menu">
 <a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
@@ -69,6 +74,16 @@
 <div class="details">
 <p class="long_description"><p>Decouples the Settings class from the query builder
 and organizes database connections</p></p>
+<table class="table table-bordered">
+<tr>
+<th>package</th>
+<td><a href="..//packages/Query.Helper%20Classes.html">Query</a></td>
+</tr>
+<tr>
+<th>subpackage</th>
+<td>Helper Classes</td>
+</tr>
+</table>
 <h3>
 <i class="icon-custom icon-method"></i> Methods</h3>
 <a name="get_connections" id="get_connections"></a><div class="element clickable method public get_connections" data-toggle="collapse" data-target=".get_connections .collapse">
@@ -137,7 +152,7 @@ and organizes database connections</p></p>
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-19T12:28:55-04:00.<br></footer></div>
+            generated on 2012-04-20T13:27:44-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/DB_SQL.html b/docs/classes/DB_SQL.html
index f89014b..3de96cb 100644
--- a/docs/classes/DB_SQL.html
+++ b/docs/classes/DB_SQL.html
@@ -18,7 +18,12 @@
 <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
 <li class="dropdown">
 <a href="#api" class="dropdown-toggle" data-toggle="dropdown">
-                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu"></ul>
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
 </li>
 <li class="dropdown" id="charts-menu">
 <a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
@@ -74,6 +79,16 @@
 <p class="short_description">Abstract parent for database manipulation subclasses</p>
 <div class="details">
 <p class="long_description"></p>
+<table class="table table-bordered">
+<tr>
+<th>package</th>
+<td><a href="..//packages/Query.Query.html">Query</a></td>
+</tr>
+<tr>
+<th>subpackage</th>
+<td>Query</td>
+</tr>
+</table>
 <h3>
 <i class="icon-custom icon-method"></i> Methods</h3>
 <a name="avg" id="avg"></a><div class="element clickable method public avg" data-toggle="collapse" data-target=".avg .collapse">
@@ -254,7 +269,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-19T12:28:55-04:00.<br></footer></div>
+            generated on 2012-04-20T13:27:44-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/DB_Table_Data.html b/docs/classes/DB_Table_Data.html
index efb1edd..d889b84 100644
--- a/docs/classes/DB_Table_Data.html
+++ b/docs/classes/DB_Table_Data.html
@@ -18,7 +18,12 @@
 <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
 <li class="dropdown">
 <a href="#api" class="dropdown-toggle" data-toggle="dropdown">
-                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu"></ul>
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
 </li>
 <li class="dropdown" id="charts-menu">
 <a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
@@ -64,6 +69,16 @@
 <p class="short_description">Popup window to display database table data</p>
 <div class="details">
 <p class="long_description"></p>
+<table class="table table-bordered">
+<tr>
+<th>package</th>
+<td><a href="..//packages/OpenSQLManager.Windows.html">OpenSQLManager</a></td>
+</tr>
+<tr>
+<th>subpackage</th>
+<td>Windows</td>
+</tr>
+</table>
 <h3>
 <i class="icon-custom icon-method"></i> Methods</h3>
 <a name="__construct" id="__construct"></a><div class="element clickable method public __construct" data-toggle="collapse" data-target=".__construct .collapse">
@@ -83,7 +98,7 @@
 <i class="icon-custom icon-property"></i> Properties</h3>
 <a name="%24win" id="$win"> </a><div class="element clickable property protected $win" data-toggle="collapse" data-target=".$win .collapse">
 <h2>Reference to the scrolled window</h2>
-<pre>$win </pre>
+<pre>$win : \GtkScrolledWindow</pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
 </div>
@@ -94,7 +109,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-19T12:28:55-04:00.<br></footer></div>
+            generated on 2012-04-20T13:27:44-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/DB_Util.html b/docs/classes/DB_Util.html
index 4e6eca7..881bdc4 100644
--- a/docs/classes/DB_Util.html
+++ b/docs/classes/DB_Util.html
@@ -18,7 +18,12 @@
 <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
 <li class="dropdown">
 <a href="#api" class="dropdown-toggle" data-toggle="dropdown">
-                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu"></ul>
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
 </li>
 <li class="dropdown" id="charts-menu">
 <a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
@@ -69,6 +74,16 @@
 <p class="short_description">Abstract class defining database / table creation methods</p>
 <div class="details">
 <p class="long_description"></p>
+<table class="table table-bordered">
+<tr>
+<th>package</th>
+<td><a href="..//packages/Query.Query.html">Query</a></td>
+</tr>
+<tr>
+<th>subpackage</th>
+<td>Query</td>
+</tr>
+</table>
 <h3>
 <i class="icon-custom icon-method"></i> Methods</h3>
 <a name="__call" id="__call"></a><div class="element clickable method public __call" data-toggle="collapse" data-target=".__call .collapse">
@@ -194,7 +209,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-19T12:28:55-04:00.<br></footer></div>
+            generated on 2012-04-20T13:27:44-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/DB_tabs.html b/docs/classes/DB_tabs.html
index 5743c97..d55c829 100644
--- a/docs/classes/DB_tabs.html
+++ b/docs/classes/DB_tabs.html
@@ -18,7 +18,12 @@
 <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
 <li class="dropdown">
 <a href="#api" class="dropdown-toggle" data-toggle="dropdown">
-                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu"></ul>
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
 </li>
 <li class="dropdown" id="charts-menu">
 <a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
@@ -75,6 +80,16 @@
 <p class="short_description">Tabbed Container for database properties</p>
 <div class="details">
 <p class="long_description"></p>
+<table class="table table-bordered">
+<tr>
+<th>package</th>
+<td><a href="..//packages/OpenSQLManager.Widgets.html">OpenSQLManager</a></td>
+</tr>
+<tr>
+<th>subpackage</th>
+<td>Widgets</td>
+</tr>
+</table>
 <h3>
 <i class="icon-custom icon-method"></i> Methods</h3>
 <a name="__construct" id="__construct"></a><div class="element clickable method public __construct" data-toggle="collapse" data-target=".__construct .collapse">
@@ -255,7 +270,7 @@
 <i class="icon-custom icon-property"></i> Properties</h3>
 <a name="%24data" id="$data"> </a><div class="element clickable property private $data" data-toggle="collapse" data-target=".$data .collapse">
 <h2>Db Data cache</h2>
-<pre>$data </pre>
+<pre>$data : array</pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
 </div>
@@ -272,7 +287,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-19T12:28:55-04:00.<br></footer></div>
+            generated on 2012-04-20T13:27:44-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/Data_Grid.html b/docs/classes/Data_Grid.html
index b32233b..c54f8f8 100644
--- a/docs/classes/Data_Grid.html
+++ b/docs/classes/Data_Grid.html
@@ -18,7 +18,12 @@
 <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
 <li class="dropdown">
 <a href="#api" class="dropdown-toggle" data-toggle="dropdown">
-                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu"></ul>
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
 </li>
 <li class="dropdown" id="charts-menu">
 <a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
@@ -68,6 +73,16 @@
 <p class="short_description">Class to simplify dealing with GtkTreeView</p>
 <div class="details">
 <p class="long_description"></p>
+<table class="table table-bordered">
+<tr>
+<th>package</th>
+<td><a href="..//packages/OpenSQLManager.Widgets.html">OpenSQLManager</a></td>
+</tr>
+<tr>
+<th>subpackage</th>
+<td>Widgets</td>
+</tr>
+</table>
 <h3>
 <i class="icon-custom icon-method"></i> Methods</h3>
 <a name="__construct" id="__construct"></a><div class="element clickable method public __construct" data-toggle="collapse" data-target=".__construct .collapse">
@@ -153,7 +168,7 @@
 <i class="icon-custom icon-property"></i> Properties</h3>
 <a name="%24model" id="$model"> </a><div class="element clickable property protected $model" data-toggle="collapse" data-target=".$model .collapse">
 <h2>GtkTreeStore object</h2>
-<pre>$model </pre>
+<pre>$model : \GtkTreeStore</pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
 </div>
@@ -164,7 +179,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-19T12:28:55-04:00.<br></footer></div>
+            generated on 2012-04-20T13:27:44-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/Edit_DB.html b/docs/classes/Edit_DB.html
index ba93a97..529159a 100644
--- a/docs/classes/Edit_DB.html
+++ b/docs/classes/Edit_DB.html
@@ -18,7 +18,12 @@
 <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
 <li class="dropdown">
 <a href="#api" class="dropdown-toggle" data-toggle="dropdown">
-                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu"></ul>
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
 </li>
 <li class="dropdown" id="charts-menu">
 <a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
@@ -60,6 +65,16 @@
 <p class="short_description">Window controlling modifications of database connections</p>
 <div class="details">
 <p class="long_description"></p>
+<table class="table table-bordered">
+<tr>
+<th>package</th>
+<td><a href="..//packages/OpenSQLManager.Windows.html">OpenSQLManager</a></td>
+</tr>
+<tr>
+<th>subpackage</th>
+<td>Windows</td>
+</tr>
+</table>
 <h3>
 <i class="icon-custom icon-method"></i> Methods</h3>
 <a name="__construct" id="__construct"></a><div class="element clickable method public __construct" data-toggle="collapse" data-target=".__construct .collapse">
@@ -82,7 +97,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-19T12:28:55-04:00.<br></footer></div>
+            generated on 2012-04-20T13:27:44-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/Firebird.html b/docs/classes/Firebird.html
index 507a5e5..f158771 100644
--- a/docs/classes/Firebird.html
+++ b/docs/classes/Firebird.html
@@ -18,7 +18,12 @@
 <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
 <li class="dropdown">
 <a href="#api" class="dropdown-toggle" data-toggle="dropdown">
-                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu"></ul>
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
 </li>
 <li class="dropdown" id="charts-menu">
 <a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
@@ -121,6 +126,16 @@ the last query executed</span><pre>$statement_link</pre></a></li>
 <p class="short_description">Firebird Database class</p>
 <div class="details">
 <p class="long_description"><p>PDO-firebird isn't stable, so this is a wrapper of the fbird_ public functions.</p></p>
+<table class="table table-bordered">
+<tr>
+<th>package</th>
+<td><a href="..//packages/Query.Drivers.html">Query</a></td>
+</tr>
+<tr>
+<th>subpackage</th>
+<td>Drivers</td>
+</tr>
+</table>
 <h3>
 <i class="icon-custom icon-method"></i> Methods</h3>
 <a name="__construct" id="__construct"></a><div class="element clickable method public __construct" data-toggle="collapse" data-target=".__construct .collapse">
@@ -794,7 +809,7 @@ the last query executed</h2>
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-19T12:28:55-04:00.<br></footer></div>
+            generated on 2012-04-20T13:27:44-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/Firebird_Result.html b/docs/classes/Firebird_Result.html
index 7028920..393d796 100644
--- a/docs/classes/Firebird_Result.html
+++ b/docs/classes/Firebird_Result.html
@@ -18,7 +18,12 @@
 <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
 <li class="dropdown">
 <a href="#api" class="dropdown-toggle" data-toggle="dropdown">
-                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu"></ul>
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
 </li>
 <li class="dropdown" id="charts-menu">
 <a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
@@ -99,6 +104,16 @@ the query</span><pre>__construct()</pre></a></li>
 data-fetching methods</p>
 <div class="details">
 <p class="long_description"></p>
+<table class="table table-bordered">
+<tr>
+<th>package</th>
+<td><a href="..//packages/Query.Drivers.html">Query</a></td>
+</tr>
+<tr>
+<th>subpackage</th>
+<td>Drivers</td>
+</tr>
+</table>
 <h3>
 <i class="icon-custom icon-method"></i> Methods</h3>
 <a name="__construct" id="__construct"></a><div class="element clickable method public __construct" data-toggle="collapse" data-target=".__construct .collapse">
@@ -480,7 +495,7 @@ the query</h2>
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-19T12:28:55-04:00.<br></footer></div>
+            generated on 2012-04-20T13:27:44-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/Firebird_SQL.html b/docs/classes/Firebird_SQL.html
index d2b591e..4887ec7 100644
--- a/docs/classes/Firebird_SQL.html
+++ b/docs/classes/Firebird_SQL.html
@@ -18,7 +18,12 @@
 <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
 <li class="dropdown">
 <a href="#api" class="dropdown-toggle" data-toggle="dropdown">
-                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu"></ul>
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
 </li>
 <li class="dropdown" id="charts-menu">
 <a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
@@ -75,6 +80,16 @@
 <p class="short_description">Firebird Specific SQL</p>
 <div class="details">
 <p class="long_description"></p>
+<table class="table table-bordered">
+<tr>
+<th>package</th>
+<td><a href="..//packages/Query.Drivers.html">Query</a></td>
+</tr>
+<tr>
+<th>subpackage</th>
+<td>Drivers</td>
+</tr>
+</table>
 <h3>
 <i class="icon-custom icon-method"></i> Methods</h3>
 <a name="avg" id="avg"></a><div class="element clickable method public avg" data-toggle="collapse" data-target=".avg .collapse">
@@ -282,7 +297,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-19T12:28:55-04:00.<br></footer></div>
+            generated on 2012-04-20T13:27:44-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/Firebird_Util.html b/docs/classes/Firebird_Util.html
index 6fda29a..da2f6b9 100644
--- a/docs/classes/Firebird_Util.html
+++ b/docs/classes/Firebird_Util.html
@@ -18,7 +18,12 @@
 <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
 <li class="dropdown">
 <a href="#api" class="dropdown-toggle" data-toggle="dropdown">
-                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu"></ul>
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
 </li>
 <li class="dropdown" id="charts-menu">
 <a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
@@ -69,6 +74,16 @@
 <p class="short_description">Firebird-specific backup, import and creation methods</p>
 <div class="details">
 <p class="long_description"></p>
+<table class="table table-bordered">
+<tr>
+<th>package</th>
+<td><a href="..//packages/Query.Drivers.html">Query</a></td>
+</tr>
+<tr>
+<th>subpackage</th>
+<td>Drivers</td>
+</tr>
+</table>
 <h3>
 <i class="icon-custom icon-method"></i> Methods</h3>
 <a name="__call" id="__call"></a><div class="element clickable method public __call" data-toggle="collapse" data-target=".__call .collapse">
@@ -197,7 +212,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-19T12:28:55-04:00.<br></footer></div>
+            generated on 2012-04-20T13:27:44-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/Main.html b/docs/classes/Main.html
index bc52227..7f52d3f 100644
--- a/docs/classes/Main.html
+++ b/docs/classes/Main.html
@@ -18,7 +18,12 @@
 <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
 <li class="dropdown">
 <a href="#api" class="dropdown-toggle" data-toggle="dropdown">
-                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu"></ul>
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
 </li>
 <li class="dropdown" id="charts-menu">
 <a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
@@ -72,6 +77,16 @@ Create menus, hboxes, vboxs and other widgets</span><pre>_main_layout()</pre></a
 <p class="short_description">Main Window Class</p>
 <div class="details">
 <p class="long_description"><p>Creates and displays the main interface window</p></p>
+<table class="table table-bordered">
+<tr>
+<th>package</th>
+<td><a href="..//packages/OpenSQLManager.Windows.html">OpenSQLManager</a></td>
+</tr>
+<tr>
+<th>subpackage</th>
+<td>Windows</td>
+</tr>
+</table>
 <h3>
 <i class="icon-custom icon-method"></i> Methods</h3>
 <a name="__construct" id="__construct"></a><div class="element clickable method public __construct" data-toggle="collapse" data-target=".__construct .collapse">
@@ -113,13 +128,13 @@ Create menus, hboxes, vboxs and other widgets</h2>
 <i class="icon-custom icon-property"></i> Properties</h3>
 <a name="%24connection_sidebar" id="$connection_sidebar"> </a><div class="element clickable property private $connection_sidebar" data-toggle="collapse" data-target=".$connection_sidebar .collapse">
 <h2>Reference to connection sidebar instance</h2>
-<pre>$connection_sidebar </pre>
+<pre>$connection_sidebar : <a href="../classes/Connection_Sidebar.html">\Connection_Sidebar</a></pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
 </div>
 <a name="%24settings" id="$settings"> </a><div class="element clickable property private $settings" data-toggle="collapse" data-target=".$settings .collapse">
 <h2>Reference to settings instance</h2>
-<pre>$settings </pre>
+<pre>$settings : <a href="../classes/Settings.html">\Settings</a></pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
 </div>
@@ -130,7 +145,7 @@ Create menus, hboxes, vboxs and other widgets</h2>
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-19T12:28:55-04:00.<br></footer></div>
+            generated on 2012-04-20T13:27:44-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/MySQL.html b/docs/classes/MySQL.html
index c62b7c2..ae54b77 100644
--- a/docs/classes/MySQL.html
+++ b/docs/classes/MySQL.html
@@ -18,7 +18,12 @@
 <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
 <li class="dropdown">
 <a href="#api" class="dropdown-toggle" data-toggle="dropdown">
-                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu"></ul>
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
 </li>
 <li class="dropdown" id="charts-menu">
 <a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
@@ -124,10 +129,16 @@ the connection/database</span><pre>get_system_tables()</pre></a></li>
 <p class="short_description">MySQL specific class</p>
 <div class="details">
 <p class="long_description"><p>Extends PDO to simplify cross-database issues</p></p>
-<table class="table table-bordered"><tr>
-<th>extends</th>
-<td>DB_PDO</td>
-</tr></table>
+<table class="table table-bordered">
+<tr>
+<th>package</th>
+<td><a href="..//packages/Query.Drivers.html">Query</a></td>
+</tr>
+<tr>
+<th>subpackage</th>
+<td>Drivers</td>
+</tr>
+</table>
 <h3>
 <i class="icon-custom icon-method"></i> Methods</h3>
 <a name="__construct" id="__construct"></a><div class="element clickable method public __construct" data-toggle="collapse" data-target=".__construct .collapse">
@@ -811,7 +822,7 @@ the connection/database</h2>
 </div>
 <a name="%24escape_char" id="$escape_char"> </a><div class="element clickable property protected $escape_char" data-toggle="collapse" data-target=".$escape_char .collapse">
 <h2>Set the backtick as the MySQL escape character</h2>
-<pre>$escape_char </pre>
+<pre>$escape_char : string</pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
 </div>
@@ -834,7 +845,7 @@ the connection/database</h2>
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-19T12:28:55-04:00.<br></footer></div>
+            generated on 2012-04-20T13:27:44-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/MySQL_SQL.html b/docs/classes/MySQL_SQL.html
index f489870..008165d 100644
--- a/docs/classes/MySQL_SQL.html
+++ b/docs/classes/MySQL_SQL.html
@@ -18,7 +18,12 @@
 <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
 <li class="dropdown">
 <a href="#api" class="dropdown-toggle" data-toggle="dropdown">
-                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu"></ul>
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
 </li>
 <li class="dropdown" id="charts-menu">
 <a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
@@ -74,6 +79,16 @@
 <p class="short_description">MySQL specifc SQL</p>
 <div class="details">
 <p class="long_description"></p>
+<table class="table table-bordered">
+<tr>
+<th>package</th>
+<td><a href="..//packages/Query.Drivers.html">Query</a></td>
+</tr>
+<tr>
+<th>subpackage</th>
+<td>Drivers</td>
+</tr>
+</table>
 <h3>
 <i class="icon-custom icon-method"></i> Methods</h3>
 <a name="avg" id="avg"></a><div class="element clickable method public avg" data-toggle="collapse" data-target=".avg .collapse">
@@ -266,7 +281,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-19T12:28:55-04:00.<br></footer></div>
+            generated on 2012-04-20T13:27:44-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/MySQL_Util.html b/docs/classes/MySQL_Util.html
index c4850cf..93d118d 100644
--- a/docs/classes/MySQL_Util.html
+++ b/docs/classes/MySQL_Util.html
@@ -18,7 +18,12 @@
 <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
 <li class="dropdown">
 <a href="#api" class="dropdown-toggle" data-toggle="dropdown">
-                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu"></ul>
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
 </li>
 <li class="dropdown" id="charts-menu">
 <a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
@@ -57,7 +62,7 @@
 <li class="method public "><a href="#backup_data" title="backup_data :: Create an SQL backup file for the current database's data"><span class="description">Create an SQL backup file for the current database's data</span><pre>backup_data()</pre></a></li>
 <li class="method public "><a href="#backup_structure" title="backup_structure :: Create an SQL backup file for the current database's structure"><span class="description">Create an SQL backup file for the current database's structure</span><pre>backup_structure()</pre></a></li>
 <li class="method public "><a href="#create_table" title="create_table :: Convienience public function for creating a new MySQL table"><span class="description">Convienience public function for creating a new MySQL table</span><pre>create_table()</pre></a></li>
-<li class="method public "><a href="#delete_table" title="delete_table :: Convience public function for droping a MySQL table"><span class="description">Convience public function for droping a MySQL table</span><pre>delete_table()</pre></a></li>
+<li class="method public "><a href="#delete_table" title="delete_table :: Convience public function for droping a table"><span class="description">Convience public function for droping a table</span><pre>delete_table()</pre></a></li>
 <li class="nav-header">
 <i class="icon-custom icon-property"></i> Properties</li>
 <li class="nav-header private">» Private</li>
@@ -69,6 +74,16 @@
 <p class="short_description">MySQL-specific backup, import and creation methods</p>
 <div class="details">
 <p class="long_description"></p>
+<table class="table table-bordered">
+<tr>
+<th>package</th>
+<td><a href="..//packages/Query.Drivers.html">Query</a></td>
+</tr>
+<tr>
+<th>subpackage</th>
+<td>Drivers</td>
+</tr>
+</table>
 <h3>
 <i class="icon-custom icon-method"></i> Methods</h3>
 <a name="__call" id="__call"></a><div class="element clickable method public __call" data-toggle="collapse" data-target=".__call .collapse">
@@ -158,7 +173,7 @@
 </div></div>
 </div>
 <a name="delete_table" id="delete_table"></a><div class="element clickable method public delete_table" data-toggle="collapse" data-target=".delete_table .collapse">
-<h2>Convience public function for droping a MySQL table</h2>
+<h2>Convience public function for droping a table</h2>
 <pre>delete_table(string $name) : string</pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8">
@@ -193,7 +208,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-19T12:28:55-04:00.<br></footer></div>
+            generated on 2012-04-20T13:27:44-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/ODBC.html b/docs/classes/ODBC.html
index a0fc4ce..af711b3 100644
--- a/docs/classes/ODBC.html
+++ b/docs/classes/ODBC.html
@@ -18,7 +18,12 @@
 <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
 <li class="dropdown">
 <a href="#api" class="dropdown-toggle" data-toggle="dropdown">
-                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu"></ul>
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
 </li>
 <li class="dropdown" id="charts-menu">
 <a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
@@ -124,10 +129,16 @@ the connection/database</span><pre>get_system_tables()</pre></a></li>
 <p class="short_description">ODBC Database Driver</p>
 <div class="details">
 <p class="long_description"><p>For general database access for databases not specified by the main drivers</p></p>
-<table class="table table-bordered"><tr>
-<th>extends</th>
-<td>DB_PDO</td>
-</tr></table>
+<table class="table table-bordered">
+<tr>
+<th>package</th>
+<td><a href="..//packages/Query.Drivers.html">Query</a></td>
+</tr>
+<tr>
+<th>subpackage</th>
+<td>Drivers</td>
+</tr>
+</table>
 <h3>
 <i class="icon-custom icon-method"></i> Methods</h3>
 <a name="__construct" id="__construct"></a><div class="element clickable method public __construct" data-toggle="collapse" data-target=".__construct .collapse">
@@ -836,7 +847,7 @@ the connection/database</h2>
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-19T12:28:55-04:00.<br></footer></div>
+            generated on 2012-04-20T13:27:44-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/ODBC_SQL.html b/docs/classes/ODBC_SQL.html
index 64331bf..90ae12a 100644
--- a/docs/classes/ODBC_SQL.html
+++ b/docs/classes/ODBC_SQL.html
@@ -18,7 +18,12 @@
 <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
 <li class="dropdown">
 <a href="#api" class="dropdown-toggle" data-toggle="dropdown">
-                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu"></ul>
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
 </li>
 <li class="dropdown" id="charts-menu">
 <a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
@@ -74,6 +79,16 @@
 <p class="short_description">ODBC SQL Class</p>
 <div class="details">
 <p class="long_description"></p>
+<table class="table table-bordered">
+<tr>
+<th>package</th>
+<td><a href="..//packages/Query.Drivers.html">Query</a></td>
+</tr>
+<tr>
+<th>subpackage</th>
+<td>Drivers</td>
+</tr>
+</table>
 <h3>
 <i class="icon-custom icon-method"></i> Methods</h3>
 <a name="avg" id="avg"></a><div class="element clickable method public avg" data-toggle="collapse" data-target=".avg .collapse">
@@ -266,7 +281,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-19T12:28:55-04:00.<br></footer></div>
+            generated on 2012-04-20T13:27:44-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/ODBC_Util.html b/docs/classes/ODBC_Util.html
index c48270f..2f3a3bc 100644
--- a/docs/classes/ODBC_Util.html
+++ b/docs/classes/ODBC_Util.html
@@ -18,7 +18,12 @@
 <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
 <li class="dropdown">
 <a href="#api" class="dropdown-toggle" data-toggle="dropdown">
-                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu"></ul>
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
 </li>
 <li class="dropdown" id="charts-menu">
 <a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
@@ -69,6 +74,16 @@
 <p class="short_description">ODBC-specific backup, import and creation methods</p>
 <div class="details">
 <p class="long_description"></p>
+<table class="table table-bordered">
+<tr>
+<th>package</th>
+<td><a href="..//packages/Query.Drivers.html">Query</a></td>
+</tr>
+<tr>
+<th>subpackage</th>
+<td>Drivers</td>
+</tr>
+</table>
 <h3>
 <i class="icon-custom icon-method"></i> Methods</h3>
 <a name="__call" id="__call"></a><div class="element clickable method public __call" data-toggle="collapse" data-target=".__call .collapse">
@@ -188,7 +203,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-19T12:28:55-04:00.<br></footer></div>
+            generated on 2012-04-20T13:27:44-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/pgSQL.html b/docs/classes/PgSQL.html
similarity index 98%
rename from docs/classes/pgSQL.html
rename to docs/classes/PgSQL.html
index 0fb5d9f..ecc904f 100644
--- a/docs/classes/pgSQL.html
+++ b/docs/classes/PgSQL.html
@@ -3,7 +3,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;">
 <meta charset="utf-8">
-<title>OpenSQLManager » \pgSQL</title>
+<title>OpenSQLManager » \PgSQL</title>
 <meta name="author" content="Mike van Riel">
 <meta name="description" content="">
 <link href="../css/template.css" rel="stylesheet" media="all">
@@ -18,7 +18,12 @@
 <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
 <li class="dropdown">
 <a href="#api" class="dropdown-toggle" data-toggle="dropdown">
-                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu"></ul>
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
 </li>
 <li class="dropdown" id="charts-menu">
 <a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
@@ -120,14 +125,20 @@ the connection/database</span><pre>get_system_tables()</pre></a></li>
 </ul>
 </div>
 <div class="span8">
-<a name="%5CpgSQL" id="\pgSQL"></a><div href="../classes/pgSQL.html" class="element class">
+<a name="%5CPgSQL" id="\PgSQL"></a><div href="../classes/PgSQL.html" class="element class">
 <p class="short_description">PostgreSQL specifc class</p>
 <div class="details">
 <p class="long_description"><p>Extends PDO to simplify cross-database issues</p></p>
-<table class="table table-bordered"><tr>
-<th>extends</th>
-<td>DB_PDO</td>
-</tr></table>
+<table class="table table-bordered">
+<tr>
+<th>package</th>
+<td><a href="..//packages/Query.Drivers.html">Query</a></td>
+</tr>
+<tr>
+<th>subpackage</th>
+<td>Drivers</td>
+</tr>
+</table>
 <h3>
 <i class="icon-custom icon-method"></i> Methods</h3>
 <a name="__construct" id="__construct"></a><div class="element clickable method public __construct" data-toggle="collapse" data-target=".__construct .collapse">
@@ -836,7 +847,7 @@ the connection/database</h2>
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-19T12:28:55-04:00.<br></footer></div>
+            generated on 2012-04-20T13:27:44-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/pgSQL_SQL.html b/docs/classes/PgSQL_SQL.html
similarity index 95%
rename from docs/classes/pgSQL_SQL.html
rename to docs/classes/PgSQL_SQL.html
index d8e3a1a..774309a 100644
--- a/docs/classes/pgSQL_SQL.html
+++ b/docs/classes/PgSQL_SQL.html
@@ -3,7 +3,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;">
 <meta charset="utf-8">
-<title>OpenSQLManager » \pgSQL_SQL</title>
+<title>OpenSQLManager » \PgSQL_SQL</title>
 <meta name="author" content="Mike van Riel">
 <meta name="description" content="">
 <link href="../css/template.css" rel="stylesheet" media="all">
@@ -18,7 +18,12 @@
 <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
 <li class="dropdown">
 <a href="#api" class="dropdown-toggle" data-toggle="dropdown">
-                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu"></ul>
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
 </li>
 <li class="dropdown" id="charts-menu">
 <a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
@@ -71,10 +76,20 @@
 </ul>
 </div>
 <div class="span8">
-<a name="%5CpgSQL_SQL" id="\pgSQL_SQL"></a><div href="../classes/pgSQL_SQL.html" class="element class">
+<a name="%5CPgSQL_SQL" id="\PgSQL_SQL"></a><div href="../classes/PgSQL_SQL.html" class="element class">
 <p class="short_description">PostgreSQL specifc SQL</p>
 <div class="details">
 <p class="long_description"></p>
+<table class="table table-bordered">
+<tr>
+<th>package</th>
+<td><a href="..//packages/Query.Drivers.html">Query</a></td>
+</tr>
+<tr>
+<th>subpackage</th>
+<td>Drivers</td>
+</tr>
+</table>
 <h3>
 <i class="icon-custom icon-method"></i> Methods</h3>
 <a name="avg" id="avg"></a><div class="element clickable method public avg" data-toggle="collapse" data-target=".avg .collapse">
@@ -282,7 +297,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-19T12:28:55-04:00.<br></footer></div>
+            generated on 2012-04-20T13:27:44-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/PgSQL_Util.html b/docs/classes/PgSQL_Util.html
index ba5829a..52780a0 100644
--- a/docs/classes/PgSQL_Util.html
+++ b/docs/classes/PgSQL_Util.html
@@ -18,7 +18,12 @@
 <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
 <li class="dropdown">
 <a href="#api" class="dropdown-toggle" data-toggle="dropdown">
-                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu"></ul>
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
 </li>
 <li class="dropdown" id="charts-menu">
 <a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
@@ -69,6 +74,16 @@
 <p class="short_description">Posgres-specific backup, import and creation methods</p>
 <div class="details">
 <p class="long_description"></p>
+<table class="table table-bordered">
+<tr>
+<th>package</th>
+<td><a href="..//packages/Query.Drivers.html">Query</a></td>
+</tr>
+<tr>
+<th>subpackage</th>
+<td>Drivers</td>
+</tr>
+</table>
 <h3>
 <i class="icon-custom icon-method"></i> Methods</h3>
 <a name="__call" id="__call"></a><div class="element clickable method public __call" data-toggle="collapse" data-target=".__call .collapse">
@@ -193,7 +208,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-19T12:28:55-04:00.<br></footer></div>
+            generated on 2012-04-20T13:27:44-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/Query_Builder.html b/docs/classes/Query_Builder.html
index e0a2a28..380bc12 100644
--- a/docs/classes/Query_Builder.html
+++ b/docs/classes/Query_Builder.html
@@ -18,7 +18,12 @@
 <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
 <li class="dropdown">
 <a href="#api" class="dropdown-toggle" data-toggle="dropdown">
-                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu"></ul>
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
 </li>
 <li class="dropdown" id="charts-menu">
 <a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
@@ -134,6 +139,16 @@ for complex select queries</span><pre>$query_map</pre></a></li>
 instantiates the specific db driver</p>
 <div class="details">
 <p class="long_description"></p>
+<table class="table table-bordered">
+<tr>
+<th>package</th>
+<td><a href="..//packages/Query.Query.html">Query</a></td>
+</tr>
+<tr>
+<th>subpackage</th>
+<td>Query</td>
+</tr>
+</table>
 <h3>
 <i class="icon-custom icon-method"></i> Methods</h3>
 <a name="__call" id="__call"></a><div class="element clickable method public __call" data-toggle="collapse" data-target=".__call .collapse">
@@ -575,10 +590,14 @@ prefixed with 'OR NOT'</h2>
 </div>
 <a name="or_not_like" id="or_not_like"></a><div class="element clickable method public or_not_like" data-toggle="collapse" data-target=".or_not_like .collapse">
 <h2>Generates a OR NOT LIKE clause</h2>
-<pre>or_not_like(string $field, mixed $val, string $pos) : \$this;</pre>
+<pre>or_not_like(string $field, mixed $val, string $pos) : <a href="../classes/Query_Builder.html">\Query_Builder</a></pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8">
 <p class="long_description"></p>
+<table class="table table-bordered"><tr>
+<th>fluent</th>
+<td>This method is part of a fluent interface and will return the same instance</td>
+</tr></table>
 <h3>Parameters</h3>
 <div class="subelement argument">
 <h4>$field</h4>
@@ -593,7 +612,7 @@ prefixed with 'OR NOT'</h2>
 <code>string</code>
 </div>
 <h3>Returns</h3>
-<div class="subelement response"><code>\$this;</code></div>
+<div class="subelement response"><code><a href="../classes/Query_Builder.html">\Query_Builder</a></code></div>
 </div></div>
 </div>
 <a name="or_where" id="or_where"></a><div class="element clickable method public or_where" data-toggle="collapse" data-target=".or_where .collapse">
@@ -1068,7 +1087,7 @@ for complex select queries</h2>
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-19T12:28:55-04:00.<br></footer></div>
+            generated on 2012-04-20T13:27:44-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/SQLite.html b/docs/classes/SQLite.html
index 0e3838a..76ec9c0 100644
--- a/docs/classes/SQLite.html
+++ b/docs/classes/SQLite.html
@@ -18,7 +18,12 @@
 <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
 <li class="dropdown">
 <a href="#api" class="dropdown-toggle" data-toggle="dropdown">
-                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu"></ul>
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
 </li>
 <li class="dropdown" id="charts-menu">
 <a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
@@ -124,10 +129,16 @@ method if the database does not support 'TRUNCATE';</span><pre>empty_table()</pr
 <p class="short_description">SQLite specific class</p>
 <div class="details">
 <p class="long_description"><p>Extends PDO to simplify cross-database issues</p></p>
-<table class="table table-bordered"><tr>
-<th>extends</th>
-<td>DB_PDO</td>
-</tr></table>
+<table class="table table-bordered">
+<tr>
+<th>package</th>
+<td><a href="..//packages/Query.Drivers.html">Query</a></td>
+</tr>
+<tr>
+<th>subpackage</th>
+<td>Drivers</td>
+</tr>
+</table>
 <h3>
 <i class="icon-custom icon-method"></i> Methods</h3>
 <a name="__construct" id="__construct"></a><div class="element clickable method public __construct" data-toggle="collapse" data-target=".__construct .collapse">
@@ -851,7 +862,7 @@ method if the database does not support 'TRUNCATE';</h2>
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-19T12:28:55-04:00.<br></footer></div>
+            generated on 2012-04-20T13:27:44-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/SQLite_SQL.html b/docs/classes/SQLite_SQL.html
index cdd947c..a1b53e5 100644
--- a/docs/classes/SQLite_SQL.html
+++ b/docs/classes/SQLite_SQL.html
@@ -18,7 +18,12 @@
 <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
 <li class="dropdown">
 <a href="#api" class="dropdown-toggle" data-toggle="dropdown">
-                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu"></ul>
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
 </li>
 <li class="dropdown" id="charts-menu">
 <a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
@@ -74,6 +79,16 @@
 <p class="short_description">SQLite Specific SQL</p>
 <div class="details">
 <p class="long_description"></p>
+<table class="table table-bordered">
+<tr>
+<th>package</th>
+<td><a href="..//packages/Query.Drivers.html">Query</a></td>
+</tr>
+<tr>
+<th>subpackage</th>
+<td>Drivers</td>
+</tr>
+</table>
 <h3>
 <i class="icon-custom icon-method"></i> Methods</h3>
 <a name="avg" id="avg"></a><div class="element clickable method public avg" data-toggle="collapse" data-target=".avg .collapse">
@@ -266,7 +281,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-19T12:28:55-04:00.<br></footer></div>
+            generated on 2012-04-20T13:27:44-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/SQLite_Util.html b/docs/classes/SQLite_Util.html
index 1ea7796..152c465 100644
--- a/docs/classes/SQLite_Util.html
+++ b/docs/classes/SQLite_Util.html
@@ -18,7 +18,12 @@
 <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
 <li class="dropdown">
 <a href="#api" class="dropdown-toggle" data-toggle="dropdown">
-                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu"></ul>
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
 </li>
 <li class="dropdown" id="charts-menu">
 <a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
@@ -69,6 +74,16 @@
 <p class="short_description">SQLite-specific backup, import and creation methods</p>
 <div class="details">
 <p class="long_description"></p>
+<table class="table table-bordered">
+<tr>
+<th>package</th>
+<td><a href="..//packages/Query.Drivers.html">Query</a></td>
+</tr>
+<tr>
+<th>subpackage</th>
+<td>Drivers</td>
+</tr>
+</table>
 <h3>
 <i class="icon-custom icon-method"></i> Methods</h3>
 <a name="__call" id="__call"></a><div class="element clickable method public __call" data-toggle="collapse" data-target=".__call .collapse">
@@ -193,7 +208,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-19T12:28:55-04:00.<br></footer></div>
+            generated on 2012-04-20T13:27:44-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/classes/SSH.html b/docs/classes/SSH.html
deleted file mode 100644
index 3c2cad5..0000000
--- a/docs/classes/SSH.html
+++ /dev/null
@@ -1,139 +0,0 @@
-<!DOCTYPE html><html xmlns:date="http://exslt.org/dates-and-times" lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;">
-<meta charset="utf-8">
-<title>OpenSQLManager » \SSH</title>
-<meta name="author" content="Mike van Riel">
-<meta name="description" content="">
-<link href="../css/template.css" rel="stylesheet" media="all">
-<script src="../js/jquery-1.7.1.min.js" type="text/javascript"></script><script src="../js/jquery-ui-1.8.2.custom.min.js" type="text/javascript"></script><script src="../js/jquery.mousewheel.min.js" type="text/javascript"></script><script src="../js/bootstrap.js" type="text/javascript"></script><script src="../js/template.js" type="text/javascript"></script><script src="../js/prettify/prettify.min.js" type="text/javascript"></script><link rel="shortcut icon" href="../img/favicon.ico">
-<link rel="apple-touch-icon" href="../img/apple-touch-icon.png">
-<link rel="apple-touch-icon" sizes="72x72" href="../img/apple-touch-icon-72x72.png">
-<link rel="apple-touch-icon" sizes="114x114" href="../img/apple-touch-icon-114x114.png">
-</head>
-<body>
-<div class="navbar navbar-fixed-top">
-<div class="navbar-inner"><div class="container">
-<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
-<li class="dropdown">
-<a href="#api" class="dropdown-toggle" data-toggle="dropdown">
-                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu"></ul>
-</li>
-<li class="dropdown" id="charts-menu">
-<a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
-                                    Charts <b class="caret"></b></a><ul class="dropdown-menu"><li><a href="../graph_class.html"><i class="icon-list-alt"></i> Class hierarchy diagram</a></li></ul>
-</li>
-<li class="dropdown" id="reports-menu">
-<a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
-                                    Reports <b class="caret"></b></a><ul class="dropdown-menu">
-<li><a href="../errors.html"><i class="icon-remove-sign"></i> Errors 
-                <span class="label label-info">43</span></a></li>
-<li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
-                <ul></ul></a></li>
-<li><a href="../deprecated.html"><i class="icon-stop"></i> Deprecated elements 
-                <span class="label label-info">0</span></a></li>
-</ul>
-</li>
-</ul></div>
-</div></div>
-<div class="go_to_top"><a href="#___" style="color: inherit">Back to top  <i class="icon-upload icon-white"></i></a></div>
-</div>
-<div id="___" class="container">
-<noscript><div class="alert alert-warning">
-                            Javascript is disabled; several features are only available
-                            if Javascript is enabled.
-                        </div></noscript>
-<div class="row">
-<div class="span4">
-<span class="btn-group visibility" data-toggle="buttons-checkbox"><button class="btn public active" title="Show public elements">Public</button><button class="btn protected" title="Show protected elements">Protected</button><button class="btn private" title="Show private elements">Private</button><button class="btn inherited active" title="Show inherited elements">Inherited</button></span><div class="btn-group view pull-right" data-toggle="buttons-radio">
-<button class="btn details" title="Show descriptions and method names"><i class="icon-list"></i></button><button class="btn simple" title="Show only method names"><i class="icon-align-justify"></i></button>
-</div>
-<ul class="side-nav nav nav-list">
-<li class="nav-header">
-<i class="icon-custom icon-method"></i> Methods</li>
-<li class="method public "><a href="#__construct" title="__construct :: Constructor"><span class="description">Constructor</span><pre>__construct()</pre></a></li>
-<li class="method public "><a href="#tunnel" title="tunnel :: Create a tunnel using the current ssh connection"><span class="description">Create a tunnel using the current ssh connection</span><pre>tunnel()</pre></a></li>
-<li class="nav-header">
-<i class="icon-custom icon-property"></i> Properties</li>
-<li class="property public "><a href="#%24stream" title="$stream :: "><span class="description">$stream</span><pre>$stream</pre></a></li>
-<li class="nav-header private">» Private</li>
-<li class="property private "><a href="#%24session" title="$session :: "><span class="description">$session</span><pre>$session</pre></a></li>
-</ul>
-</div>
-<div class="span8">
-<a name="%5CSSH" id="\SSH"></a><div href="../classes/SSH.html" class="element class">
-<p class="short_description">Class to create ssh tunnels to connect to protected database servers</p>
-<div class="details">
-<p class="long_description"></p>
-<h3>
-<i class="icon-custom icon-method"></i> Methods</h3>
-<a name="__construct" id="__construct"></a><div class="element clickable method public __construct" data-toggle="collapse" data-target=".__construct .collapse">
-<h2>Constructor</h2>
-<pre>__construct(string $host, int $port) </pre>
-<div class="labels"></div>
-<div class="row collapse"><div class="span8">
-<p class="long_description"></p>
-<h3>Parameters</h3>
-<div class="subelement argument">
-<h4>$host</h4>
-<code>string</code>
-</div>
-<div class="subelement argument">
-<h4>$port</h4>
-<code>int</code>
-</div>
-</div></div>
-</div>
-<a name="tunnel" id="tunnel"></a><div class="element clickable method public tunnel" data-toggle="collapse" data-target=".tunnel .collapse">
-<h2>Create a tunnel using the current ssh connection</h2>
-<pre>tunnel(string $host, int $port, string $auth_type, array $auth_params) : \stream</pre>
-<div class="labels"></div>
-<div class="row collapse"><div class="span8">
-<p class="long_description"></p>
-<h3>Parameters</h3>
-<div class="subelement argument">
-<h4>$host</h4>
-<code>string</code>
-</div>
-<div class="subelement argument">
-<h4>$port</h4>
-<code>int</code>
-</div>
-<div class="subelement argument">
-<h4>$auth_type</h4>
-<code>string</code>
-</div>
-<div class="subelement argument">
-<h4>$auth_params</h4>
-<code>array</code>
-</div>
-<h3>Returns</h3>
-<div class="subelement response"><code>\stream</code></div>
-</div></div>
-</div>
-<h3>
-<i class="icon-custom icon-property"></i> Properties</h3>
-<a name="%24stream" id="$stream"> </a><div class="element clickable property public $stream" data-toggle="collapse" data-target=".$stream .collapse">
-<h2>$stream</h2>
-<pre>$stream </pre>
-<div class="labels"></div>
-<div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
-</div>
-<a name="%24session" id="$session"> </a><div class="element clickable property private $session" data-toggle="collapse" data-target=".$session .collapse">
-<h2>$session</h2>
-<pre>$session </pre>
-<div class="labels"></div>
-<div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
-</div>
-</div>
-</div>
-</div>
-</div>
-<div class="row"><footer class="span12">
-            Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
-            Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-19T11:50:12-04:00.<br></footer></div>
-</div>
-</body>
-</html>
diff --git a/docs/classes/Settings.html b/docs/classes/Settings.html
index e099ef6..46b2b8f 100644
--- a/docs/classes/Settings.html
+++ b/docs/classes/Settings.html
@@ -18,7 +18,12 @@
 <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
 <li class="dropdown">
 <a href="#api" class="dropdown-toggle" data-toggle="dropdown">
-                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu"></ul>
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
 </li>
 <li class="dropdown" id="charts-menu">
 <a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
@@ -78,7 +83,17 @@ directly - the settings should be safe!</span><pre>__construct()</pre></a></li>
 <a name="%5CSettings" id="\Settings"></a><div href="../classes/Settings.html" class="element class">
 <p class="short_description">Class for manipulating datbase connections, and miscellaneous settings</p>
 <div class="details">
-<p class="long_description"><p>Use JSON for compatibility</p></p>
+<p class="long_description"></p>
+<table class="table table-bordered">
+<tr>
+<th>package</th>
+<td><a href="..//packages/Query.Helper%20Classes.html">Query</a></td>
+</tr>
+<tr>
+<th>subpackage</th>
+<td>Helper Classes</td>
+</tr>
+</table>
 <h3>
 <i class="icon-custom icon-method"></i> Methods</h3>
 <a name="__destruct" id="__destruct"></a><div class="element clickable method public __destruct" data-toggle="collapse" data-target=".__destruct .collapse">
@@ -229,7 +244,7 @@ directly - the settings should be safe!</h2>
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-19T12:28:55-04:00.<br></footer></div>
+            generated on 2012-04-20T13:27:44-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/deprecated.html b/docs/deprecated.html
index 606539c..4eba540 100644
--- a/docs/deprecated.html
+++ b/docs/deprecated.html
@@ -18,7 +18,12 @@
 <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
 <li class="dropdown">
 <a href="#api" class="dropdown-toggle" data-toggle="dropdown">
-                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu"></ul>
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
 </li>
 <li class="dropdown" id="charts-menu">
 <a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
@@ -62,7 +67,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-19T12:28:55-04:00.<br></footer></div>
+            generated on 2012-04-20T13:27:44-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/errors.html b/docs/errors.html
index 50f18df..ffa3d7f 100644
--- a/docs/errors.html
+++ b/docs/errors.html
@@ -18,7 +18,12 @@
 <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
 <li class="dropdown">
 <a href="#api" class="dropdown-toggle" data-toggle="dropdown">
-                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu"></ul>
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
 </li>
 <li class="dropdown" id="charts-menu">
 <a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
@@ -98,7 +103,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-19T12:28:55-04:00.<br></footer></div>
+            generated on 2012-04-20T13:27:44-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/graph_class.html b/docs/graph_class.html
index fe96a8c..8098fd3 100644
--- a/docs/graph_class.html
+++ b/docs/graph_class.html
@@ -18,7 +18,12 @@
 <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
 <li class="dropdown">
 <a href="#api" class="dropdown-toggle" data-toggle="dropdown">
-                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu"></ul>
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
 </li>
 <li class="dropdown" id="charts-menu">
 <a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
@@ -59,7 +64,7 @@
         </script><div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-19T12:28:55-04:00.<br></footer></div>
+            generated on 2012-04-20T13:27:44-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/index.html b/docs/index.html
index 105e058..eaa3836 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -18,7 +18,12 @@
 <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
 <li class="dropdown">
 <a href="#api" class="dropdown-toggle" data-toggle="dropdown">
-                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu"></ul>
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
 </li>
 <li class="dropdown" id="charts-menu">
 <a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
@@ -52,6 +57,8 @@
 <div class="span7"><div class="well"><ul class="nav nav-list">
 <li class="nav-header">Packages</li>
 <li><a href="packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
 </ul></div></div>
 <div class="span5">
 <div class="well"><ul class="nav nav-list">
@@ -73,7 +80,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-19T12:28:55-04:00.<br></footer></div>
+            generated on 2012-04-20T13:27:43-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/markers.html b/docs/markers.html
index 4f567ae..206428f 100644
--- a/docs/markers.html
+++ b/docs/markers.html
@@ -18,7 +18,12 @@
 <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
 <li class="dropdown">
 <a href="#api" class="dropdown-toggle" data-toggle="dropdown">
-                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu"></ul>
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
 </li>
 <li class="dropdown" id="charts-menu">
 <a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
@@ -64,7 +69,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-19T12:28:55-04:00.<br></footer></div>
+            generated on 2012-04-20T13:27:44-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/namespaces/default.html b/docs/namespaces/default.html
index 7cb0d22..1c1937b 100644
--- a/docs/namespaces/default.html
+++ b/docs/namespaces/default.html
@@ -18,7 +18,12 @@
 <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
 <li class="dropdown">
 <a href="#api" class="dropdown-toggle" data-toggle="dropdown">
-                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu"></ul>
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
 </li>
 <li class="dropdown" id="charts-menu">
 <a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
@@ -74,7 +79,7 @@
 <div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
 </div>
 <a name="alert" id="alert"></a><div class="element clickable function  alert" data-toggle="collapse" data-target=".alert .collapse">
-<h2>Create info dialog to retun an informational message</h2>
+<h2>Create info dialog to return an informational message</h2>
 <pre>alert(string $message) : void</pre>
 <div class="labels"></div>
 <div class="row collapse"><div class="span8">
@@ -369,6 +374,20 @@ data-fetching methods</p>
 <div class="details collapse"></div>
 <a href="../classes/ODBC_Util.html" class="more">« More »</a>
 </div>
+<a name="PgSQL" id="PgSQL"></a><div class="element ajax clickable class" href="../classes/PgSQL.html">
+<h1>PgSQL<a href="../classes/PgSQL.html">¶</a>
+</h1>
+<p class="short_description">PostgreSQL specifc class</p>
+<div class="details collapse"></div>
+<a href="../classes/PgSQL.html" class="more">« More »</a>
+</div>
+<a name="PgSQL_SQL" id="PgSQL_SQL"></a><div class="element ajax clickable class" href="../classes/PgSQL_SQL.html">
+<h1>PgSQL_SQL<a href="../classes/PgSQL_SQL.html">¶</a>
+</h1>
+<p class="short_description">PostgreSQL specifc SQL</p>
+<div class="details collapse"></div>
+<a href="../classes/PgSQL_SQL.html" class="more">« More »</a>
+</div>
 <a name="PgSQL_Util" id="PgSQL_Util"></a><div class="element ajax clickable class" href="../classes/PgSQL_Util.html">
 <h1>PgSQL_Util<a href="../classes/PgSQL_Util.html">¶</a>
 </h1>
@@ -412,20 +431,6 @@ instantiates the specific db driver</p>
 <div class="details collapse"></div>
 <a href="../classes/Settings.html" class="more">« More »</a>
 </div>
-<a name="pgSQL" id="pgSQL"></a><div class="element ajax clickable class" href="../classes/pgSQL.html">
-<h1>pgSQL<a href="../classes/pgSQL.html">¶</a>
-</h1>
-<p class="short_description">PostgreSQL specifc class</p>
-<div class="details collapse"></div>
-<a href="../classes/pgSQL.html" class="more">« More »</a>
-</div>
-<a name="pgSQL_SQL" id="pgSQL_SQL"></a><div class="element ajax clickable class" href="../classes/pgSQL_SQL.html">
-<h1>pgSQL_SQL<a href="../classes/pgSQL_SQL.html">¶</a>
-</h1>
-<p class="short_description">PostgreSQL specifc SQL</p>
-<div class="details collapse"></div>
-<a href="../classes/pgSQL_SQL.html" class="more">« More »</a>
-</div>
 <h3>
 <i class="icon-custom icon-constant"></i> Constants</h3>
 <a name="BASE_DIR" id="BASE_DIR"> </a><div class="element clickable constant  BASE_DIR" data-toggle="collapse" data-target=".BASE_DIR .collapse">
@@ -470,7 +475,7 @@ instantiates the specific db driver</p>
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-19T12:28:55-04:00.<br></footer></div>
+            generated on 2012-04-20T13:27:43-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/packages/.html b/docs/packages/.html
index 9a64f0f..1e574ba 100644
--- a/docs/packages/.html
+++ b/docs/packages/.html
@@ -18,7 +18,12 @@
 <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
 <li class="dropdown">
 <a href="#api" class="dropdown-toggle" data-toggle="dropdown">
-                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu"></ul>
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
 </li>
 <li class="dropdown" id="charts-menu">
 <a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
@@ -62,7 +67,7 @@
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-19T12:28:55-04:00.<br></footer></div>
+            generated on 2012-04-20T13:27:44-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/packages/Default.html b/docs/packages/Default.html
index c38db03..125ab00 100644
--- a/docs/packages/Default.html
+++ b/docs/packages/Default.html
@@ -18,7 +18,12 @@
 <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
 <li class="dropdown">
 <a href="#api" class="dropdown-toggle" data-toggle="dropdown">
-                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu"></ul>
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
 </li>
 <li class="dropdown" id="charts-menu">
 <a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
@@ -56,56 +61,6 @@
 <a href="../packages/Default.html" title="Default"><i class="icon-folder-open"></i>Default</a><ul class="nav nav-list nav-packages"></ul>
 </li>
 <li class="nav-header">
-<i class="icon-custom icon-function"></i> Functions</li>
-<li class="function  "><a href="#about" title="about :: Display About menu with version information"><span class="description">Display About menu with version information</span><pre>about</pre></a></li>
-<li class="function  "><a href="#alert" title="alert :: Create info dialog to retun an informational message"><span class="description">Create info dialog to retun an informational message</span><pre>alert</pre></a></li>
-<li class="function  "><a href="#array_to_object" title="array_to_object :: Convert an array to an object"><span class="description">Convert an array to an object</span><pre>array_to_object</pre></a></li>
-<li class="function  "><a href="#confirm" title="confirm :: Creates a binary confirmation dialog"><span class="description">Creates a binary confirmation dialog</span><pre>confirm</pre></a></li>
-<li class="function  "><a href="#db_filter" title="db_filter :: Filter out db rows into one array"><span class="description">Filter out db rows into one array</span><pre>db_filter</pre></a></li>
-<li class="function  "><a href="#do_include" title="do_include :: Bulk directory loading workaround for use
-with array_map and glob"><span class="description">Bulk directory loading workaround for use
-with array_map and glob</span><pre>do_include</pre></a></li>
-<li class="function  "><a href="#do_include" title="do_include :: Bulk directory loading workaround for use
-with array_map and glob"><span class="description">Bulk directory loading workaround for use
-with array_map and glob</span><pre>do_include</pre></a></li>
-<li class="function  "><a href="#error" title="error :: Create info dialog to retun an informational message"><span class="description">Create info dialog to retun an informational message</span><pre>error</pre></a></li>
-<li class="function  "><a href="#exception_error_handler" title="exception_error_handler :: Error handler to convert errors to exceptions"><span class="description">Error handler to convert errors to exceptions</span><pre>exception_error_handler</pre></a></li>
-<li class="function  "><a href="#log_fatal" title="log_fatal :: Log fatal errors"><span class="description">Log fatal errors</span><pre>log_fatal</pre></a></li>
-<li class="nav-header">
-<i class="icon-custom icon-class"></i> Classes</li>
-<li><a href="#DB_Reg" title="Connection registry">DB_Reg</a></li>
-<li><a href="#Settings" title="Class for manipulating datbase connections, and miscellaneous settings">Settings</a></li>
-<li><a href="#DB_SQL" title="Abstract parent for database manipulation subclasses">DB_SQL</a></li>
-<li><a href="#DB_PDO" title="Base Database class">DB_PDO</a></li>
-<li><a href="#Query_Builder" title="Convienience class for creating sql queries - also the class that
-instantiates the specific db driver">Query_Builder</a></li>
-<li><a href="#DB_Util" title="Abstract class defining database / table creation methods">DB_Util</a></li>
-<li><a href="#pgSQL_SQL" title="PostgreSQL specifc SQL">pgSQL_SQL</a></li>
-<li><a href="#PgSQL_Util" title="Posgres-specific backup, import and creation methods">PgSQL_Util</a></li>
-<li><a href="#pgSQL" title="PostgreSQL specifc class">pgSQL</a></li>
-<li><a href="#ODBC_Util" title="ODBC-specific backup, import and creation methods">ODBC_Util</a></li>
-<li><a href="#ODBC_SQL" title="ODBC SQL Class">ODBC_SQL</a></li>
-<li><a href="#ODBC" title="ODBC Database Driver">ODBC</a></li>
-<li><a href="#MySQL_Util" title="MySQL-specific backup, import and creation methods">MySQL_Util</a></li>
-<li><a href="#MySQL" title="MySQL specific class">MySQL</a></li>
-<li><a href="#MySQL_SQL" title="MySQL specifc SQL">MySQL_SQL</a></li>
-<li><a href="#SQLite_Util" title="SQLite-specific backup, import and creation methods">SQLite_Util</a></li>
-<li><a href="#SQLite" title="SQLite specific class">SQLite</a></li>
-<li><a href="#SQLite_SQL" title="SQLite Specific SQL">SQLite_SQL</a></li>
-<li><a href="#Firebird_SQL" title="Firebird Specific SQL">Firebird_SQL</a></li>
-<li><a href="#Firebird_Result" title="Firebird result class to emulate PDOStatement Class - only implements
-data-fetching methods">Firebird_Result</a></li>
-<li><a href="#Firebird" title="Firebird Database class">Firebird</a></li>
-<li><a href="#Firebird_Util" title="Firebird-specific backup, import and creation methods">Firebird_Util</a></li>
-<li><a href="#Connection_Sidebar" title="Widget managing saved database connections">Connection_Sidebar</a></li>
-<li><a href="#Data_Grid" title="Class to simplify dealing with GtkTreeView">Data_Grid</a></li>
-<li><a href="#DB_tabs" title="Tabbed Container for database properties">DB_tabs</a></li>
-<li><a href="#DB_Info_Widget" title="Widget for adding / editing database connections">DB_Info_Widget</a></li>
-<li><a href="#Add_DB" title="Window controlling addition of database connections">Add_DB</a></li>
-<li><a href="#Edit_DB" title="Window controlling modifications of database connections">Edit_DB</a></li>
-<li><a href="#DB_Table_Data" title="Popup window to display database table data">DB_Table_Data</a></li>
-<li><a href="#Main" title="Main Window Class">Main</a></li>
-<li class="nav-header">
 <i class="icon-custom icon-constant"></i> Constants</li>
 <li class="constant  "><a href="#BASE_DIR" title="BASE_DIR :: "><span class="description">BASE_DIR</span><pre>BASE_DIR</pre></a></li>
 <li class="constant  "><a href="#BASE_PATH" title="BASE_PATH :: Reference to root path"><span class="description">Reference to root path</span><pre>BASE_PATH</pre></a></li>
@@ -124,367 +79,6 @@ data-fetching methods">Firebird_Result</a></li>
 </ul>
 <div class="package-indent">
 <h3>
-<i class="icon-custom icon-function"></i> Functions</h3>
-<a name="about" id="about"></a><div class="element clickable function  about" data-toggle="collapse" data-target=".about .collapse">
-<h2>Display About menu with version information</h2>
-<pre>about() : void</pre>
-<div class="labels"></div>
-<div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
-</div>
-<a name="alert" id="alert"></a><div class="element clickable function  alert" data-toggle="collapse" data-target=".alert .collapse">
-<h2>Create info dialog to retun an informational message</h2>
-<pre>alert(string $message) : void</pre>
-<div class="labels"></div>
-<div class="row collapse"><div class="span8">
-<p class="long_description"></p>
-<h3>Parameters</h3>
-<div class="subelement argument">
-<h4>$message</h4>
-<code>string</code>
-</div>
-</div></div>
-</div>
-<a name="array_to_object" id="array_to_object"></a><div class="element clickable function  array_to_object" data-toggle="collapse" data-target=".array_to_object .collapse">
-<h2>Convert an array to an object</h2>
-<pre>array_to_object(array $array) : object</pre>
-<div class="labels"></div>
-<div class="row collapse"><div class="span8">
-<p class="long_description"></p>
-<h3>Parameters</h3>
-<div class="subelement argument">
-<h4>$array</h4>
-<code>array</code>
-</div>
-<h3>Returns</h3>
-<div class="subelement response"><code>object</code></div>
-</div></div>
-</div>
-<a name="confirm" id="confirm"></a><div class="element clickable function  confirm" data-toggle="collapse" data-target=".confirm .collapse">
-<h2>Creates a binary confirmation dialog</h2>
-<pre>confirm(string $message) : bool</pre>
-<div class="labels"></div>
-<div class="row collapse"><div class="span8">
-<p class="long_description"></p>
-<h3>Parameters</h3>
-<div class="subelement argument">
-<h4>$message</h4>
-<code>string</code>
-</div>
-<h3>Returns</h3>
-<div class="subelement response"><code>bool</code></div>
-</div></div>
-</div>
-<a name="db_filter" id="db_filter"></a><div class="element clickable function  db_filter" data-toggle="collapse" data-target=".db_filter .collapse">
-<h2>Filter out db rows into one array</h2>
-<pre>db_filter(array $array, mixed $index) : array</pre>
-<div class="labels"></div>
-<div class="row collapse"><div class="span8">
-<p class="long_description"></p>
-<h3>Parameters</h3>
-<div class="subelement argument">
-<h4>$array</h4>
-<code>array</code>
-</div>
-<div class="subelement argument">
-<h4>$index</h4>
-<code>mixed</code>
-</div>
-<h3>Returns</h3>
-<div class="subelement response"><code>array</code></div>
-</div></div>
-</div>
-<a name="do_include" id="do_include"></a><div class="element clickable function  do_include" data-toggle="collapse" data-target=".do_include .collapse">
-<h2>Bulk directory loading workaround for use
-with array_map and glob</h2>
-<pre>do_include(string $path) : void</pre>
-<div class="labels"></div>
-<div class="row collapse"><div class="span8">
-<p class="long_description"></p>
-<h3>Parameters</h3>
-<div class="subelement argument">
-<h4>$path</h4>
-<code>string</code>
-</div>
-</div></div>
-</div>
-<a name="do_include" id="do_include"></a><div class="element clickable function  do_include" data-toggle="collapse" data-target=".do_include .collapse">
-<h2>Bulk directory loading workaround for use
-with array_map and glob</h2>
-<pre>do_include(string $path) : void</pre>
-<div class="labels"></div>
-<div class="row collapse"><div class="span8">
-<p class="long_description"></p>
-<h3>Parameters</h3>
-<div class="subelement argument">
-<h4>$path</h4>
-<code>string</code>
-</div>
-</div></div>
-</div>
-<a name="error" id="error"></a><div class="element clickable function  error" data-toggle="collapse" data-target=".error .collapse">
-<h2>Create info dialog to retun an informational message</h2>
-<pre>error(string $message) : void</pre>
-<div class="labels"></div>
-<div class="row collapse"><div class="span8">
-<p class="long_description"></p>
-<h3>Parameters</h3>
-<div class="subelement argument">
-<h4>$message</h4>
-<code>string</code>
-</div>
-</div></div>
-</div>
-<a name="exception_error_handler" id="exception_error_handler"></a><div class="element clickable function  exception_error_handler" data-toggle="collapse" data-target=".exception_error_handler .collapse">
-<h2>Error handler to convert errors to exceptions</h2>
-<pre>exception_error_handler(int $errno, string $errstr, string $errfile, int $errline) </pre>
-<div class="labels"></div>
-<div class="row collapse"><div class="span8">
-<p class="long_description"></p>
-<h3>Parameters</h3>
-<div class="subelement argument">
-<h4>$errno</h4>
-<code>int</code>
-</div>
-<div class="subelement argument">
-<h4>$errstr</h4>
-<code>string</code>
-</div>
-<div class="subelement argument">
-<h4>$errfile</h4>
-<code>string</code>
-</div>
-<div class="subelement argument">
-<h4>$errline</h4>
-<code>int</code>
-</div>
-<h3>Exceptions</h3>
-<table class="table table-bordered"><tr>
-<th><code><a href="http://php.net/manual/en/class.errorexception.php">\ErrorException</a></code></th>
-<td></td>
-</tr></table>
-</div></div>
-</div>
-<a name="log_fatal" id="log_fatal"></a><div class="element clickable function  log_fatal" data-toggle="collapse" data-target=".log_fatal .collapse">
-<h2>Log fatal errors</h2>
-<pre>log_fatal() </pre>
-<div class="labels"></div>
-<div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
-</div>
-<h3>
-<i class="icon-custom icon-class"></i> Classes and interfaces</h3>
-<a name="Add_DB" id="Add_DB"></a><div class="element ajax clickable class" href="../classes/Add_DB.html">
-<h1>Add_DB<a href="../classes/Add_DB.html">¶</a>
-</h1>
-<p class="short_description">Window controlling addition of database connections</p>
-<div class="details collapse"></div>
-<a href="../classes/Add_DB.html" class="more">« More »</a>
-</div>
-<a name="Connection_Sidebar" id="Connection_Sidebar"></a><div class="element ajax clickable class" href="../classes/Connection_Sidebar.html">
-<h1>Connection_Sidebar<a href="../classes/Connection_Sidebar.html">¶</a>
-</h1>
-<p class="short_description">Widget managing saved database connections</p>
-<div class="details collapse"></div>
-<a href="../classes/Connection_Sidebar.html" class="more">« More »</a>
-</div>
-<a name="DB_Info_Widget" id="DB_Info_Widget"></a><div class="element ajax clickable class" href="../classes/DB_Info_Widget.html">
-<h1>DB_Info_Widget<a href="../classes/DB_Info_Widget.html">¶</a>
-</h1>
-<p class="short_description">Widget for adding / editing database connections</p>
-<div class="details collapse"></div>
-<a href="../classes/DB_Info_Widget.html" class="more">« More »</a>
-</div>
-<a name="DB_PDO" id="DB_PDO"></a><div class="element ajax clickable class" href="../classes/DB_PDO.html">
-<h1>DB_PDO<a href="../classes/DB_PDO.html">¶</a>
-</h1>
-<p class="short_description">Base Database class</p>
-<div class="details collapse"></div>
-<a href="../classes/DB_PDO.html" class="more">« More »</a>
-</div>
-<a name="DB_Reg" id="DB_Reg"></a><div class="element ajax clickable class" href="../classes/DB_Reg.html">
-<h1>DB_Reg<a href="../classes/DB_Reg.html">¶</a>
-</h1>
-<p class="short_description">Connection registry</p>
-<div class="details collapse"></div>
-<a href="../classes/DB_Reg.html" class="more">« More »</a>
-</div>
-<a name="DB_SQL" id="DB_SQL"></a><div class="element ajax clickable class" href="../classes/DB_SQL.html">
-<h1>DB_SQL<a href="../classes/DB_SQL.html">¶</a>
-</h1>
-<p class="short_description">Abstract parent for database manipulation subclasses</p>
-<div class="details collapse"></div>
-<a href="../classes/DB_SQL.html" class="more">« More »</a>
-</div>
-<a name="DB_Table_Data" id="DB_Table_Data"></a><div class="element ajax clickable class" href="../classes/DB_Table_Data.html">
-<h1>DB_Table_Data<a href="../classes/DB_Table_Data.html">¶</a>
-</h1>
-<p class="short_description">Popup window to display database table data</p>
-<div class="details collapse"></div>
-<a href="../classes/DB_Table_Data.html" class="more">« More »</a>
-</div>
-<a name="DB_Util" id="DB_Util"></a><div class="element ajax clickable class" href="../classes/DB_Util.html">
-<h1>DB_Util<a href="../classes/DB_Util.html">¶</a>
-</h1>
-<p class="short_description">Abstract class defining database / table creation methods</p>
-<div class="details collapse"></div>
-<a href="../classes/DB_Util.html" class="more">« More »</a>
-</div>
-<a name="DB_tabs" id="DB_tabs"></a><div class="element ajax clickable class" href="../classes/DB_tabs.html">
-<h1>DB_tabs<a href="../classes/DB_tabs.html">¶</a>
-</h1>
-<p class="short_description">Tabbed Container for database properties</p>
-<div class="details collapse"></div>
-<a href="../classes/DB_tabs.html" class="more">« More »</a>
-</div>
-<a name="Data_Grid" id="Data_Grid"></a><div class="element ajax clickable class" href="../classes/Data_Grid.html">
-<h1>Data_Grid<a href="../classes/Data_Grid.html">¶</a>
-</h1>
-<p class="short_description">Class to simplify dealing with GtkTreeView</p>
-<div class="details collapse"></div>
-<a href="../classes/Data_Grid.html" class="more">« More »</a>
-</div>
-<a name="Edit_DB" id="Edit_DB"></a><div class="element ajax clickable class" href="../classes/Edit_DB.html">
-<h1>Edit_DB<a href="../classes/Edit_DB.html">¶</a>
-</h1>
-<p class="short_description">Window controlling modifications of database connections</p>
-<div class="details collapse"></div>
-<a href="../classes/Edit_DB.html" class="more">« More »</a>
-</div>
-<a name="Firebird" id="Firebird"></a><div class="element ajax clickable class" href="../classes/Firebird.html">
-<h1>Firebird<a href="../classes/Firebird.html">¶</a>
-</h1>
-<p class="short_description">Firebird Database class</p>
-<div class="details collapse"></div>
-<a href="../classes/Firebird.html" class="more">« More »</a>
-</div>
-<a name="Firebird_Result" id="Firebird_Result"></a><div class="element ajax clickable class" href="../classes/Firebird_Result.html">
-<h1>Firebird_Result<a href="../classes/Firebird_Result.html">¶</a>
-</h1>
-<p class="short_description">Firebird result class to emulate PDOStatement Class - only implements
-data-fetching methods</p>
-<div class="details collapse"></div>
-<a href="../classes/Firebird_Result.html" class="more">« More »</a>
-</div>
-<a name="Firebird_SQL" id="Firebird_SQL"></a><div class="element ajax clickable class" href="../classes/Firebird_SQL.html">
-<h1>Firebird_SQL<a href="../classes/Firebird_SQL.html">¶</a>
-</h1>
-<p class="short_description">Firebird Specific SQL</p>
-<div class="details collapse"></div>
-<a href="../classes/Firebird_SQL.html" class="more">« More »</a>
-</div>
-<a name="Firebird_Util" id="Firebird_Util"></a><div class="element ajax clickable class" href="../classes/Firebird_Util.html">
-<h1>Firebird_Util<a href="../classes/Firebird_Util.html">¶</a>
-</h1>
-<p class="short_description">Firebird-specific backup, import and creation methods</p>
-<div class="details collapse"></div>
-<a href="../classes/Firebird_Util.html" class="more">« More »</a>
-</div>
-<a name="Main" id="Main"></a><div class="element ajax clickable class" href="../classes/Main.html">
-<h1>Main<a href="../classes/Main.html">¶</a>
-</h1>
-<p class="short_description">Main Window Class</p>
-<div class="details collapse"></div>
-<a href="../classes/Main.html" class="more">« More »</a>
-</div>
-<a name="MySQL" id="MySQL"></a><div class="element ajax clickable class" href="../classes/MySQL.html">
-<h1>MySQL<a href="../classes/MySQL.html">¶</a>
-</h1>
-<p class="short_description">MySQL specific class</p>
-<div class="details collapse"></div>
-<a href="../classes/MySQL.html" class="more">« More »</a>
-</div>
-<a name="MySQL_SQL" id="MySQL_SQL"></a><div class="element ajax clickable class" href="../classes/MySQL_SQL.html">
-<h1>MySQL_SQL<a href="../classes/MySQL_SQL.html">¶</a>
-</h1>
-<p class="short_description">MySQL specifc SQL</p>
-<div class="details collapse"></div>
-<a href="../classes/MySQL_SQL.html" class="more">« More »</a>
-</div>
-<a name="MySQL_Util" id="MySQL_Util"></a><div class="element ajax clickable class" href="../classes/MySQL_Util.html">
-<h1>MySQL_Util<a href="../classes/MySQL_Util.html">¶</a>
-</h1>
-<p class="short_description">MySQL-specific backup, import and creation methods</p>
-<div class="details collapse"></div>
-<a href="../classes/MySQL_Util.html" class="more">« More »</a>
-</div>
-<a name="ODBC" id="ODBC"></a><div class="element ajax clickable class" href="../classes/ODBC.html">
-<h1>ODBC<a href="../classes/ODBC.html">¶</a>
-</h1>
-<p class="short_description">ODBC Database Driver</p>
-<div class="details collapse"></div>
-<a href="../classes/ODBC.html" class="more">« More »</a>
-</div>
-<a name="ODBC_SQL" id="ODBC_SQL"></a><div class="element ajax clickable class" href="../classes/ODBC_SQL.html">
-<h1>ODBC_SQL<a href="../classes/ODBC_SQL.html">¶</a>
-</h1>
-<p class="short_description">ODBC SQL Class</p>
-<div class="details collapse"></div>
-<a href="../classes/ODBC_SQL.html" class="more">« More »</a>
-</div>
-<a name="ODBC_Util" id="ODBC_Util"></a><div class="element ajax clickable class" href="../classes/ODBC_Util.html">
-<h1>ODBC_Util<a href="../classes/ODBC_Util.html">¶</a>
-</h1>
-<p class="short_description">ODBC-specific backup, import and creation methods</p>
-<div class="details collapse"></div>
-<a href="../classes/ODBC_Util.html" class="more">« More »</a>
-</div>
-<a name="PgSQL_Util" id="PgSQL_Util"></a><div class="element ajax clickable class" href="../classes/PgSQL_Util.html">
-<h1>PgSQL_Util<a href="../classes/PgSQL_Util.html">¶</a>
-</h1>
-<p class="short_description">Posgres-specific backup, import and creation methods</p>
-<div class="details collapse"></div>
-<a href="../classes/PgSQL_Util.html" class="more">« More »</a>
-</div>
-<a name="Query_Builder" id="Query_Builder"></a><div class="element ajax clickable class" href="../classes/Query_Builder.html">
-<h1>Query_Builder<a href="../classes/Query_Builder.html">¶</a>
-</h1>
-<p class="short_description">Convienience class for creating sql queries - also the class that
-instantiates the specific db driver</p>
-<div class="details collapse"></div>
-<a href="../classes/Query_Builder.html" class="more">« More »</a>
-</div>
-<a name="SQLite" id="SQLite"></a><div class="element ajax clickable class" href="../classes/SQLite.html">
-<h1>SQLite<a href="../classes/SQLite.html">¶</a>
-</h1>
-<p class="short_description">SQLite specific class</p>
-<div class="details collapse"></div>
-<a href="../classes/SQLite.html" class="more">« More »</a>
-</div>
-<a name="SQLite_SQL" id="SQLite_SQL"></a><div class="element ajax clickable class" href="../classes/SQLite_SQL.html">
-<h1>SQLite_SQL<a href="../classes/SQLite_SQL.html">¶</a>
-</h1>
-<p class="short_description">SQLite Specific SQL</p>
-<div class="details collapse"></div>
-<a href="../classes/SQLite_SQL.html" class="more">« More »</a>
-</div>
-<a name="SQLite_Util" id="SQLite_Util"></a><div class="element ajax clickable class" href="../classes/SQLite_Util.html">
-<h1>SQLite_Util<a href="../classes/SQLite_Util.html">¶</a>
-</h1>
-<p class="short_description">SQLite-specific backup, import and creation methods</p>
-<div class="details collapse"></div>
-<a href="../classes/SQLite_Util.html" class="more">« More »</a>
-</div>
-<a name="Settings" id="Settings"></a><div class="element ajax clickable class" href="../classes/Settings.html">
-<h1>Settings<a href="../classes/Settings.html">¶</a>
-</h1>
-<p class="short_description">Class for manipulating datbase connections, and miscellaneous settings</p>
-<div class="details collapse"></div>
-<a href="../classes/Settings.html" class="more">« More »</a>
-</div>
-<a name="pgSQL" id="pgSQL"></a><div class="element ajax clickable class" href="../classes/pgSQL.html">
-<h1>pgSQL<a href="../classes/pgSQL.html">¶</a>
-</h1>
-<p class="short_description">PostgreSQL specifc class</p>
-<div class="details collapse"></div>
-<a href="../classes/pgSQL.html" class="more">« More »</a>
-</div>
-<a name="pgSQL_SQL" id="pgSQL_SQL"></a><div class="element ajax clickable class" href="../classes/pgSQL_SQL.html">
-<h1>pgSQL_SQL<a href="../classes/pgSQL_SQL.html">¶</a>
-</h1>
-<p class="short_description">PostgreSQL specifc SQL</p>
-<div class="details collapse"></div>
-<a href="../classes/pgSQL_SQL.html" class="more">« More »</a>
-</div>
-<h3>
 <i class="icon-custom icon-constant"></i> Constants</h3>
 <a name="BASE_DIR" id="BASE_DIR"> </a><div class="element clickable constant  BASE_DIR" data-toggle="collapse" data-target=".BASE_DIR .collapse">
 <h2>BASE_DIR</h2>
@@ -528,7 +122,7 @@ instantiates the specific db driver</p>
 <div class="row"><footer class="span12">
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
-            generated on 2012-04-19T12:28:55-04:00.<br></footer></div>
+            generated on 2012-04-20T13:27:44-04:00.<br></footer></div>
 </div>
 </body>
 </html>
diff --git a/docs/packages/OpenSQLManager.Widgets.html b/docs/packages/OpenSQLManager.Widgets.html
new file mode 100644
index 0000000..c6ce3ad
--- /dev/null
+++ b/docs/packages/OpenSQLManager.Widgets.html
@@ -0,0 +1,119 @@
+<!DOCTYPE html><html xmlns:date="http://exslt.org/dates-and-times" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;">
+<meta charset="utf-8">
+<title>OpenSQLManager » OpenSQLManager\Widgets</title>
+<meta name="author" content="Mike van Riel">
+<meta name="description" content="">
+<link href="../css/template.css" rel="stylesheet" media="all">
+<script src="../js/jquery-1.7.1.min.js" type="text/javascript"></script><script src="../js/jquery-ui-1.8.2.custom.min.js" type="text/javascript"></script><script src="../js/jquery.mousewheel.min.js" type="text/javascript"></script><script src="../js/bootstrap.js" type="text/javascript"></script><script src="../js/template.js" type="text/javascript"></script><script src="../js/prettify/prettify.min.js" type="text/javascript"></script><link rel="shortcut icon" href="../img/favicon.ico">
+<link rel="apple-touch-icon" href="../img/apple-touch-icon.png">
+<link rel="apple-touch-icon" sizes="72x72" href="../img/apple-touch-icon-72x72.png">
+<link rel="apple-touch-icon" sizes="114x114" href="../img/apple-touch-icon-114x114.png">
+</head>
+<body>
+<div class="navbar navbar-fixed-top">
+<div class="navbar-inner"><div class="container">
+<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
+<li class="dropdown">
+<a href="#api" class="dropdown-toggle" data-toggle="dropdown">
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
+</li>
+<li class="dropdown" id="charts-menu">
+<a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
+                                    Charts <b class="caret"></b></a><ul class="dropdown-menu"><li><a href="../graph_class.html"><i class="icon-list-alt"></i> Class hierarchy diagram</a></li></ul>
+</li>
+<li class="dropdown" id="reports-menu">
+<a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
+                                    Reports <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a href="../errors.html"><i class="icon-remove-sign"></i> Errors 
+                <span class="label label-info">0</span></a></li>
+<li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
+                <ul></ul></a></li>
+<li><a href="../deprecated.html"><i class="icon-stop"></i> Deprecated elements 
+                <span class="label label-info">0</span></a></li>
+</ul>
+</li>
+</ul></div>
+</div></div>
+<div class="go_to_top"><a href="#___" style="color: inherit">Back to top  <i class="icon-upload icon-white"></i></a></div>
+</div>
+<div id="___" class="container">
+<noscript><div class="alert alert-warning">
+                            Javascript is disabled; several features are only available
+                            if Javascript is enabled.
+                        </div></noscript>
+<div class="row">
+<div class="span4">
+<div class="btn-group view pull-right" data-toggle="buttons-radio">
+<button class="btn details" title="Show descriptions and method names"><i class="icon-list"></i></button><button class="btn simple" title="Show only method names"><i class="icon-align-justify"></i></button>
+</div>
+<ul class="side-nav nav nav-list">
+<li class="nav-header">
+<i class="icon-map-marker"></i> Packages</li>
+<li>
+<a href="../packages/OpenSQLManager.Widgets.html" title="Widgets"><i class="icon-folder-open"></i>Widgets</a><ul class="nav nav-list nav-packages"></ul>
+</li>
+<li class="nav-header">
+<i class="icon-custom icon-class"></i> Classes</li>
+<li><a href="#Connection_Sidebar" title="Widget managing saved database connections">Connection_Sidebar</a></li>
+<li><a href="#Data_Grid" title="Class to simplify dealing with GtkTreeView">Data_Grid</a></li>
+<li><a href="#DB_tabs" title="Tabbed Container for database properties">DB_tabs</a></li>
+<li><a href="#DB_Info_Widget" title="Widget for adding / editing database connections">DB_Info_Widget</a></li>
+</ul>
+</div>
+<div class="span8 package-contents">
+<ul class="breadcrumb">
+<li>
+<a href="../index.html"><i class="icon-folder-open"></i></a><span class="divider">\</span>
+</li>
+<li><a href="../packages/OpenSQLManager.html">OpenSQLManager</a></li>
+<span class="divider">\</span><li class="active"><a href="../packages/OpenSQLManager.Widgets.html">Widgets</a></li>
+</ul>
+<div class="package-indent">
+<h3>
+<i class="icon-custom icon-class"></i> Classes and interfaces</h3>
+<a name="Connection_Sidebar" id="Connection_Sidebar"></a><div class="element ajax clickable class" href="../classes/Connection_Sidebar.html">
+<h1>Connection_Sidebar<a href="../classes/Connection_Sidebar.html">¶</a>
+</h1>
+<p class="short_description">Widget managing saved database connections</p>
+<div class="details collapse"></div>
+<a href="../classes/Connection_Sidebar.html" class="more">« More »</a>
+</div>
+<a name="DB_Info_Widget" id="DB_Info_Widget"></a><div class="element ajax clickable class" href="../classes/DB_Info_Widget.html">
+<h1>DB_Info_Widget<a href="../classes/DB_Info_Widget.html">¶</a>
+</h1>
+<p class="short_description">Widget for adding / editing database connections</p>
+<div class="details collapse"></div>
+<a href="../classes/DB_Info_Widget.html" class="more">« More »</a>
+</div>
+<a name="DB_tabs" id="DB_tabs"></a><div class="element ajax clickable class" href="../classes/DB_tabs.html">
+<h1>DB_tabs<a href="../classes/DB_tabs.html">¶</a>
+</h1>
+<p class="short_description">Tabbed Container for database properties</p>
+<div class="details collapse"></div>
+<a href="../classes/DB_tabs.html" class="more">« More »</a>
+</div>
+<a name="Data_Grid" id="Data_Grid"></a><div class="element ajax clickable class" href="../classes/Data_Grid.html">
+<h1>Data_Grid<a href="../classes/Data_Grid.html">¶</a>
+</h1>
+<p class="short_description">Class to simplify dealing with GtkTreeView</p>
+<div class="details collapse"></div>
+<a href="../classes/Data_Grid.html" class="more">« More »</a>
+</div>
+</div>
+</div>
+</div>
+<div class="row"><footer class="span12">
+            Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
+            Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
+            generated on 2012-04-20T13:27:44-04:00.<br></footer></div>
+</div>
+</body>
+</html>
diff --git a/docs/packages/OpenSQLManager.Windows.html b/docs/packages/OpenSQLManager.Windows.html
new file mode 100644
index 0000000..8b2e25a
--- /dev/null
+++ b/docs/packages/OpenSQLManager.Windows.html
@@ -0,0 +1,119 @@
+<!DOCTYPE html><html xmlns:date="http://exslt.org/dates-and-times" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;">
+<meta charset="utf-8">
+<title>OpenSQLManager » OpenSQLManager\Windows</title>
+<meta name="author" content="Mike van Riel">
+<meta name="description" content="">
+<link href="../css/template.css" rel="stylesheet" media="all">
+<script src="../js/jquery-1.7.1.min.js" type="text/javascript"></script><script src="../js/jquery-ui-1.8.2.custom.min.js" type="text/javascript"></script><script src="../js/jquery.mousewheel.min.js" type="text/javascript"></script><script src="../js/bootstrap.js" type="text/javascript"></script><script src="../js/template.js" type="text/javascript"></script><script src="../js/prettify/prettify.min.js" type="text/javascript"></script><link rel="shortcut icon" href="../img/favicon.ico">
+<link rel="apple-touch-icon" href="../img/apple-touch-icon.png">
+<link rel="apple-touch-icon" sizes="72x72" href="../img/apple-touch-icon-72x72.png">
+<link rel="apple-touch-icon" sizes="114x114" href="../img/apple-touch-icon-114x114.png">
+</head>
+<body>
+<div class="navbar navbar-fixed-top">
+<div class="navbar-inner"><div class="container">
+<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
+<li class="dropdown">
+<a href="#api" class="dropdown-toggle" data-toggle="dropdown">
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
+</li>
+<li class="dropdown" id="charts-menu">
+<a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
+                                    Charts <b class="caret"></b></a><ul class="dropdown-menu"><li><a href="../graph_class.html"><i class="icon-list-alt"></i> Class hierarchy diagram</a></li></ul>
+</li>
+<li class="dropdown" id="reports-menu">
+<a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
+                                    Reports <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a href="../errors.html"><i class="icon-remove-sign"></i> Errors 
+                <span class="label label-info">0</span></a></li>
+<li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
+                <ul></ul></a></li>
+<li><a href="../deprecated.html"><i class="icon-stop"></i> Deprecated elements 
+                <span class="label label-info">0</span></a></li>
+</ul>
+</li>
+</ul></div>
+</div></div>
+<div class="go_to_top"><a href="#___" style="color: inherit">Back to top  <i class="icon-upload icon-white"></i></a></div>
+</div>
+<div id="___" class="container">
+<noscript><div class="alert alert-warning">
+                            Javascript is disabled; several features are only available
+                            if Javascript is enabled.
+                        </div></noscript>
+<div class="row">
+<div class="span4">
+<div class="btn-group view pull-right" data-toggle="buttons-radio">
+<button class="btn details" title="Show descriptions and method names"><i class="icon-list"></i></button><button class="btn simple" title="Show only method names"><i class="icon-align-justify"></i></button>
+</div>
+<ul class="side-nav nav nav-list">
+<li class="nav-header">
+<i class="icon-map-marker"></i> Packages</li>
+<li>
+<a href="../packages/OpenSQLManager.Windows.html" title="Windows"><i class="icon-folder-open"></i>Windows</a><ul class="nav nav-list nav-packages"></ul>
+</li>
+<li class="nav-header">
+<i class="icon-custom icon-class"></i> Classes</li>
+<li><a href="#Add_DB" title="Window controlling addition of database connections">Add_DB</a></li>
+<li><a href="#Edit_DB" title="Window controlling modifications of database connections">Edit_DB</a></li>
+<li><a href="#DB_Table_Data" title="Popup window to display database table data">DB_Table_Data</a></li>
+<li><a href="#Main" title="Main Window Class">Main</a></li>
+</ul>
+</div>
+<div class="span8 package-contents">
+<ul class="breadcrumb">
+<li>
+<a href="../index.html"><i class="icon-folder-open"></i></a><span class="divider">\</span>
+</li>
+<li><a href="../packages/OpenSQLManager.html">OpenSQLManager</a></li>
+<span class="divider">\</span><li class="active"><a href="../packages/OpenSQLManager.Windows.html">Windows</a></li>
+</ul>
+<div class="package-indent">
+<h3>
+<i class="icon-custom icon-class"></i> Classes and interfaces</h3>
+<a name="Add_DB" id="Add_DB"></a><div class="element ajax clickable class" href="../classes/Add_DB.html">
+<h1>Add_DB<a href="../classes/Add_DB.html">¶</a>
+</h1>
+<p class="short_description">Window controlling addition of database connections</p>
+<div class="details collapse"></div>
+<a href="../classes/Add_DB.html" class="more">« More »</a>
+</div>
+<a name="DB_Table_Data" id="DB_Table_Data"></a><div class="element ajax clickable class" href="../classes/DB_Table_Data.html">
+<h1>DB_Table_Data<a href="../classes/DB_Table_Data.html">¶</a>
+</h1>
+<p class="short_description">Popup window to display database table data</p>
+<div class="details collapse"></div>
+<a href="../classes/DB_Table_Data.html" class="more">« More »</a>
+</div>
+<a name="Edit_DB" id="Edit_DB"></a><div class="element ajax clickable class" href="../classes/Edit_DB.html">
+<h1>Edit_DB<a href="../classes/Edit_DB.html">¶</a>
+</h1>
+<p class="short_description">Window controlling modifications of database connections</p>
+<div class="details collapse"></div>
+<a href="../classes/Edit_DB.html" class="more">« More »</a>
+</div>
+<a name="Main" id="Main"></a><div class="element ajax clickable class" href="../classes/Main.html">
+<h1>Main<a href="../classes/Main.html">¶</a>
+</h1>
+<p class="short_description">Main Window Class</p>
+<div class="details collapse"></div>
+<a href="../classes/Main.html" class="more">« More »</a>
+</div>
+</div>
+</div>
+</div>
+<div class="row"><footer class="span12">
+            Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
+            Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
+            generated on 2012-04-20T13:27:44-04:00.<br></footer></div>
+</div>
+</body>
+</html>
diff --git a/docs/packages/OpenSQLManager.html b/docs/packages/OpenSQLManager.html
new file mode 100644
index 0000000..8f0a333
--- /dev/null
+++ b/docs/packages/OpenSQLManager.html
@@ -0,0 +1,293 @@
+<!DOCTYPE html><html xmlns:date="http://exslt.org/dates-and-times" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;">
+<meta charset="utf-8">
+<title>OpenSQLManager » OpenSQLManager</title>
+<meta name="author" content="Mike van Riel">
+<meta name="description" content="">
+<link href="../css/template.css" rel="stylesheet" media="all">
+<script src="../js/jquery-1.7.1.min.js" type="text/javascript"></script><script src="../js/jquery-ui-1.8.2.custom.min.js" type="text/javascript"></script><script src="../js/jquery.mousewheel.min.js" type="text/javascript"></script><script src="../js/bootstrap.js" type="text/javascript"></script><script src="../js/template.js" type="text/javascript"></script><script src="../js/prettify/prettify.min.js" type="text/javascript"></script><link rel="shortcut icon" href="../img/favicon.ico">
+<link rel="apple-touch-icon" href="../img/apple-touch-icon.png">
+<link rel="apple-touch-icon" sizes="72x72" href="../img/apple-touch-icon-72x72.png">
+<link rel="apple-touch-icon" sizes="114x114" href="../img/apple-touch-icon-114x114.png">
+</head>
+<body>
+<div class="navbar navbar-fixed-top">
+<div class="navbar-inner"><div class="container">
+<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
+<li class="dropdown">
+<a href="#api" class="dropdown-toggle" data-toggle="dropdown">
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
+</li>
+<li class="dropdown" id="charts-menu">
+<a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
+                                    Charts <b class="caret"></b></a><ul class="dropdown-menu"><li><a href="../graph_class.html"><i class="icon-list-alt"></i> Class hierarchy diagram</a></li></ul>
+</li>
+<li class="dropdown" id="reports-menu">
+<a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
+                                    Reports <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a href="../errors.html"><i class="icon-remove-sign"></i> Errors 
+                <span class="label label-info">0</span></a></li>
+<li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
+                <ul></ul></a></li>
+<li><a href="../deprecated.html"><i class="icon-stop"></i> Deprecated elements 
+                <span class="label label-info">0</span></a></li>
+</ul>
+</li>
+</ul></div>
+</div></div>
+<div class="go_to_top"><a href="#___" style="color: inherit">Back to top  <i class="icon-upload icon-white"></i></a></div>
+</div>
+<div id="___" class="container">
+<noscript><div class="alert alert-warning">
+                            Javascript is disabled; several features are only available
+                            if Javascript is enabled.
+                        </div></noscript>
+<div class="row">
+<div class="span4">
+<div class="btn-group view pull-right" data-toggle="buttons-radio">
+<button class="btn details" title="Show descriptions and method names"><i class="icon-list"></i></button><button class="btn simple" title="Show only method names"><i class="icon-align-justify"></i></button>
+</div>
+<ul class="side-nav nav nav-list">
+<li class="nav-header">
+<i class="icon-map-marker"></i> Packages</li>
+<li>
+<a href="../packages/OpenSQLManager.html" title="OpenSQLManager"><i class="icon-folder-open"></i>OpenSQLManager</a><ul class="nav nav-list nav-packages">
+<li>
+<a href="../packages/OpenSQLManager.Widgets.html" title="Widgets"><i class="icon-folder-open"></i>Widgets</a><ul class="nav nav-list nav-packages"></ul>
+</li>
+<li>
+<a href="../packages/OpenSQLManager.Windows.html" title="Windows"><i class="icon-folder-open"></i>Windows</a><ul class="nav nav-list nav-packages"></ul>
+</li>
+</ul>
+</li>
+<li class="nav-header">
+<i class="icon-custom icon-function"></i> Functions</li>
+<li class="function  "><a href="#about" title="about :: Display About menu with version information"><span class="description">Display About menu with version information</span><pre>about</pre></a></li>
+<li class="function  "><a href="#alert" title="alert :: Create info dialog to return an informational message"><span class="description">Create info dialog to return an informational message</span><pre>alert</pre></a></li>
+<li class="function  "><a href="#array_to_object" title="array_to_object :: Convert an array to an object"><span class="description">Convert an array to an object</span><pre>array_to_object</pre></a></li>
+<li class="function  "><a href="#confirm" title="confirm :: Creates a binary confirmation dialog"><span class="description">Creates a binary confirmation dialog</span><pre>confirm</pre></a></li>
+<li class="function  "><a href="#do_include" title="do_include :: Bulk directory loading workaround for use
+with array_map and glob"><span class="description">Bulk directory loading workaround for use
+with array_map and glob</span><pre>do_include</pre></a></li>
+<li class="function  "><a href="#error" title="error :: Create info dialog to retun an informational message"><span class="description">Create info dialog to retun an informational message</span><pre>error</pre></a></li>
+<li class="function  "><a href="#exception_error_handler" title="exception_error_handler :: Error handler to convert errors to exceptions"><span class="description">Error handler to convert errors to exceptions</span><pre>exception_error_handler</pre></a></li>
+<li class="function  "><a href="#log_fatal" title="log_fatal :: Log fatal errors"><span class="description">Log fatal errors</span><pre>log_fatal</pre></a></li>
+</ul>
+</div>
+<div class="span8 package-contents">
+<ul class="breadcrumb">
+<li>
+<a href="../index.html"><i class="icon-folder-open"></i></a><span class="divider">\</span>
+</li>
+<li class="active"><a href="../packages/OpenSQLManager.html">OpenSQLManager</a></li>
+</ul>
+<div class="package-indent">
+<h3>
+<i class="icon-custom icon-function"></i> Functions</h3>
+<a name="about" id="about"></a><div class="element clickable function  about" data-toggle="collapse" data-target=".about .collapse">
+<h2>Display About menu with version information</h2>
+<pre>about() : void</pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
+</div>
+<a name="alert" id="alert"></a><div class="element clickable function  alert" data-toggle="collapse" data-target=".alert .collapse">
+<h2>Create info dialog to return an informational message</h2>
+<pre>alert(string $message) : void</pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8">
+<p class="long_description"></p>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$message</h4>
+<code>string</code>
+</div>
+</div></div>
+</div>
+<a name="array_to_object" id="array_to_object"></a><div class="element clickable function  array_to_object" data-toggle="collapse" data-target=".array_to_object .collapse">
+<h2>Convert an array to an object</h2>
+<pre>array_to_object(array $array) : object</pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8">
+<p class="long_description"></p>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$array</h4>
+<code>array</code>
+</div>
+<h3>Returns</h3>
+<div class="subelement response"><code>object</code></div>
+</div></div>
+</div>
+<a name="confirm" id="confirm"></a><div class="element clickable function  confirm" data-toggle="collapse" data-target=".confirm .collapse">
+<h2>Creates a binary confirmation dialog</h2>
+<pre>confirm(string $message) : bool</pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8">
+<p class="long_description"></p>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$message</h4>
+<code>string</code>
+</div>
+<h3>Returns</h3>
+<div class="subelement response"><code>bool</code></div>
+</div></div>
+</div>
+<a name="do_include" id="do_include"></a><div class="element clickable function  do_include" data-toggle="collapse" data-target=".do_include .collapse">
+<h2>Bulk directory loading workaround for use
+with array_map and glob</h2>
+<pre>do_include(string $path) : void</pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8">
+<p class="long_description"></p>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$path</h4>
+<code>string</code>
+</div>
+</div></div>
+</div>
+<a name="error" id="error"></a><div class="element clickable function  error" data-toggle="collapse" data-target=".error .collapse">
+<h2>Create info dialog to retun an informational message</h2>
+<pre>error(string $message) : void</pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8">
+<p class="long_description"></p>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$message</h4>
+<code>string</code>
+</div>
+</div></div>
+</div>
+<a name="exception_error_handler" id="exception_error_handler"></a><div class="element clickable function  exception_error_handler" data-toggle="collapse" data-target=".exception_error_handler .collapse">
+<h2>Error handler to convert errors to exceptions</h2>
+<pre>exception_error_handler(int $errno, string $errstr, string $errfile, int $errline) </pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8">
+<p class="long_description"></p>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$errno</h4>
+<code>int</code>
+</div>
+<div class="subelement argument">
+<h4>$errstr</h4>
+<code>string</code>
+</div>
+<div class="subelement argument">
+<h4>$errfile</h4>
+<code>string</code>
+</div>
+<div class="subelement argument">
+<h4>$errline</h4>
+<code>int</code>
+</div>
+<h3>Exceptions</h3>
+<table class="table table-bordered"><tr>
+<th><code><a href="http://php.net/manual/en/class.errorexception.php">\ErrorException</a></code></th>
+<td></td>
+</tr></table>
+</div></div>
+</div>
+<a name="log_fatal" id="log_fatal"></a><div class="element clickable function  log_fatal" data-toggle="collapse" data-target=".log_fatal .collapse">
+<h2>Log fatal errors</h2>
+<pre>log_fatal() </pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8"><p class="long_description"></p></div></div>
+</div>
+<ul class="breadcrumb">
+<li>
+<a href="../index.html"><i class="icon-folder-open"></i></a><span class="divider">\</span>
+</li>
+<li><a href="../packages/OpenSQLManager.html">OpenSQLManager</a></li>
+<span class="divider">\</span><li class="active"><a href="../packages/OpenSQLManager.Widgets.html">Widgets</a></li>
+</ul>
+<div class="package-indent">
+<h3>
+<i class="icon-custom icon-class"></i> Classes and interfaces</h3>
+<a name="Connection_Sidebar" id="Connection_Sidebar"></a><div class="element ajax clickable class" href="../classes/Connection_Sidebar.html">
+<h1>Connection_Sidebar<a href="../classes/Connection_Sidebar.html">¶</a>
+</h1>
+<p class="short_description">Widget managing saved database connections</p>
+<div class="details collapse"></div>
+<a href="../classes/Connection_Sidebar.html" class="more">« More »</a>
+</div>
+<a name="DB_Info_Widget" id="DB_Info_Widget"></a><div class="element ajax clickable class" href="../classes/DB_Info_Widget.html">
+<h1>DB_Info_Widget<a href="../classes/DB_Info_Widget.html">¶</a>
+</h1>
+<p class="short_description">Widget for adding / editing database connections</p>
+<div class="details collapse"></div>
+<a href="../classes/DB_Info_Widget.html" class="more">« More »</a>
+</div>
+<a name="DB_tabs" id="DB_tabs"></a><div class="element ajax clickable class" href="../classes/DB_tabs.html">
+<h1>DB_tabs<a href="../classes/DB_tabs.html">¶</a>
+</h1>
+<p class="short_description">Tabbed Container for database properties</p>
+<div class="details collapse"></div>
+<a href="../classes/DB_tabs.html" class="more">« More »</a>
+</div>
+<a name="Data_Grid" id="Data_Grid"></a><div class="element ajax clickable class" href="../classes/Data_Grid.html">
+<h1>Data_Grid<a href="../classes/Data_Grid.html">¶</a>
+</h1>
+<p class="short_description">Class to simplify dealing with GtkTreeView</p>
+<div class="details collapse"></div>
+<a href="../classes/Data_Grid.html" class="more">« More »</a>
+</div>
+</div>
+<ul class="breadcrumb">
+<li>
+<a href="../index.html"><i class="icon-folder-open"></i></a><span class="divider">\</span>
+</li>
+<li><a href="../packages/OpenSQLManager.html">OpenSQLManager</a></li>
+<span class="divider">\</span><li class="active"><a href="../packages/OpenSQLManager.Windows.html">Windows</a></li>
+</ul>
+<div class="package-indent">
+<h3>
+<i class="icon-custom icon-class"></i> Classes and interfaces</h3>
+<a name="Add_DB" id="Add_DB"></a><div class="element ajax clickable class" href="../classes/Add_DB.html">
+<h1>Add_DB<a href="../classes/Add_DB.html">¶</a>
+</h1>
+<p class="short_description">Window controlling addition of database connections</p>
+<div class="details collapse"></div>
+<a href="../classes/Add_DB.html" class="more">« More »</a>
+</div>
+<a name="DB_Table_Data" id="DB_Table_Data"></a><div class="element ajax clickable class" href="../classes/DB_Table_Data.html">
+<h1>DB_Table_Data<a href="../classes/DB_Table_Data.html">¶</a>
+</h1>
+<p class="short_description">Popup window to display database table data</p>
+<div class="details collapse"></div>
+<a href="../classes/DB_Table_Data.html" class="more">« More »</a>
+</div>
+<a name="Edit_DB" id="Edit_DB"></a><div class="element ajax clickable class" href="../classes/Edit_DB.html">
+<h1>Edit_DB<a href="../classes/Edit_DB.html">¶</a>
+</h1>
+<p class="short_description">Window controlling modifications of database connections</p>
+<div class="details collapse"></div>
+<a href="../classes/Edit_DB.html" class="more">« More »</a>
+</div>
+<a name="Main" id="Main"></a><div class="element ajax clickable class" href="../classes/Main.html">
+<h1>Main<a href="../classes/Main.html">¶</a>
+</h1>
+<p class="short_description">Main Window Class</p>
+<div class="details collapse"></div>
+<a href="../classes/Main.html" class="more">« More »</a>
+</div>
+</div>
+</div>
+</div>
+</div>
+<div class="row"><footer class="span12">
+            Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
+            Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
+            generated on 2012-04-20T13:27:44-04:00.<br></footer></div>
+</div>
+</body>
+</html>
diff --git a/docs/packages/Query.Drivers.html b/docs/packages/Query.Drivers.html
new file mode 100644
index 0000000..dbcd8c4
--- /dev/null
+++ b/docs/packages/Query.Drivers.html
@@ -0,0 +1,217 @@
+<!DOCTYPE html><html xmlns:date="http://exslt.org/dates-and-times" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;">
+<meta charset="utf-8">
+<title>OpenSQLManager » Query\Drivers</title>
+<meta name="author" content="Mike van Riel">
+<meta name="description" content="">
+<link href="../css/template.css" rel="stylesheet" media="all">
+<script src="../js/jquery-1.7.1.min.js" type="text/javascript"></script><script src="../js/jquery-ui-1.8.2.custom.min.js" type="text/javascript"></script><script src="../js/jquery.mousewheel.min.js" type="text/javascript"></script><script src="../js/bootstrap.js" type="text/javascript"></script><script src="../js/template.js" type="text/javascript"></script><script src="../js/prettify/prettify.min.js" type="text/javascript"></script><link rel="shortcut icon" href="../img/favicon.ico">
+<link rel="apple-touch-icon" href="../img/apple-touch-icon.png">
+<link rel="apple-touch-icon" sizes="72x72" href="../img/apple-touch-icon-72x72.png">
+<link rel="apple-touch-icon" sizes="114x114" href="../img/apple-touch-icon-114x114.png">
+</head>
+<body>
+<div class="navbar navbar-fixed-top">
+<div class="navbar-inner"><div class="container">
+<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
+<li class="dropdown">
+<a href="#api" class="dropdown-toggle" data-toggle="dropdown">
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
+</li>
+<li class="dropdown" id="charts-menu">
+<a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
+                                    Charts <b class="caret"></b></a><ul class="dropdown-menu"><li><a href="../graph_class.html"><i class="icon-list-alt"></i> Class hierarchy diagram</a></li></ul>
+</li>
+<li class="dropdown" id="reports-menu">
+<a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
+                                    Reports <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a href="../errors.html"><i class="icon-remove-sign"></i> Errors 
+                <span class="label label-info">0</span></a></li>
+<li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
+                <ul></ul></a></li>
+<li><a href="../deprecated.html"><i class="icon-stop"></i> Deprecated elements 
+                <span class="label label-info">0</span></a></li>
+</ul>
+</li>
+</ul></div>
+</div></div>
+<div class="go_to_top"><a href="#___" style="color: inherit">Back to top  <i class="icon-upload icon-white"></i></a></div>
+</div>
+<div id="___" class="container">
+<noscript><div class="alert alert-warning">
+                            Javascript is disabled; several features are only available
+                            if Javascript is enabled.
+                        </div></noscript>
+<div class="row">
+<div class="span4">
+<div class="btn-group view pull-right" data-toggle="buttons-radio">
+<button class="btn details" title="Show descriptions and method names"><i class="icon-list"></i></button><button class="btn simple" title="Show only method names"><i class="icon-align-justify"></i></button>
+</div>
+<ul class="side-nav nav nav-list">
+<li class="nav-header">
+<i class="icon-map-marker"></i> Packages</li>
+<li>
+<a href="../packages/Query.Drivers.html" title="Drivers"><i class="icon-folder-open"></i>Drivers</a><ul class="nav nav-list nav-packages"></ul>
+</li>
+<li class="nav-header">
+<i class="icon-custom icon-class"></i> Classes</li>
+<li><a href="#PgSQL_SQL" title="PostgreSQL specifc SQL">PgSQL_SQL</a></li>
+<li><a href="#PgSQL_Util" title="Posgres-specific backup, import and creation methods">PgSQL_Util</a></li>
+<li><a href="#PgSQL" title="PostgreSQL specifc class">PgSQL</a></li>
+<li><a href="#ODBC_Util" title="ODBC-specific backup, import and creation methods">ODBC_Util</a></li>
+<li><a href="#ODBC_SQL" title="ODBC SQL Class">ODBC_SQL</a></li>
+<li><a href="#ODBC" title="ODBC Database Driver">ODBC</a></li>
+<li><a href="#MySQL_Util" title="MySQL-specific backup, import and creation methods">MySQL_Util</a></li>
+<li><a href="#MySQL" title="MySQL specific class">MySQL</a></li>
+<li><a href="#MySQL_SQL" title="MySQL specifc SQL">MySQL_SQL</a></li>
+<li><a href="#SQLite_Util" title="SQLite-specific backup, import and creation methods">SQLite_Util</a></li>
+<li><a href="#SQLite" title="SQLite specific class">SQLite</a></li>
+<li><a href="#SQLite_SQL" title="SQLite Specific SQL">SQLite_SQL</a></li>
+<li><a href="#Firebird_SQL" title="Firebird Specific SQL">Firebird_SQL</a></li>
+<li><a href="#Firebird_Result" title="Firebird result class to emulate PDOStatement Class - only implements
+data-fetching methods">Firebird_Result</a></li>
+<li><a href="#Firebird" title="Firebird Database class">Firebird</a></li>
+<li><a href="#Firebird_Util" title="Firebird-specific backup, import and creation methods">Firebird_Util</a></li>
+</ul>
+</div>
+<div class="span8 package-contents">
+<ul class="breadcrumb">
+<li>
+<a href="../index.html"><i class="icon-folder-open"></i></a><span class="divider">\</span>
+</li>
+<li><a href="../packages/Query.html">Query</a></li>
+<span class="divider">\</span><li class="active"><a href="../packages/Query.Drivers.html">Drivers</a></li>
+</ul>
+<div class="package-indent">
+<h3>
+<i class="icon-custom icon-class"></i> Classes and interfaces</h3>
+<a name="Firebird" id="Firebird"></a><div class="element ajax clickable class" href="../classes/Firebird.html">
+<h1>Firebird<a href="../classes/Firebird.html">¶</a>
+</h1>
+<p class="short_description">Firebird Database class</p>
+<div class="details collapse"></div>
+<a href="../classes/Firebird.html" class="more">« More »</a>
+</div>
+<a name="Firebird_Result" id="Firebird_Result"></a><div class="element ajax clickable class" href="../classes/Firebird_Result.html">
+<h1>Firebird_Result<a href="../classes/Firebird_Result.html">¶</a>
+</h1>
+<p class="short_description">Firebird result class to emulate PDOStatement Class - only implements
+data-fetching methods</p>
+<div class="details collapse"></div>
+<a href="../classes/Firebird_Result.html" class="more">« More »</a>
+</div>
+<a name="Firebird_SQL" id="Firebird_SQL"></a><div class="element ajax clickable class" href="../classes/Firebird_SQL.html">
+<h1>Firebird_SQL<a href="../classes/Firebird_SQL.html">¶</a>
+</h1>
+<p class="short_description">Firebird Specific SQL</p>
+<div class="details collapse"></div>
+<a href="../classes/Firebird_SQL.html" class="more">« More »</a>
+</div>
+<a name="Firebird_Util" id="Firebird_Util"></a><div class="element ajax clickable class" href="../classes/Firebird_Util.html">
+<h1>Firebird_Util<a href="../classes/Firebird_Util.html">¶</a>
+</h1>
+<p class="short_description">Firebird-specific backup, import and creation methods</p>
+<div class="details collapse"></div>
+<a href="../classes/Firebird_Util.html" class="more">« More »</a>
+</div>
+<a name="MySQL" id="MySQL"></a><div class="element ajax clickable class" href="../classes/MySQL.html">
+<h1>MySQL<a href="../classes/MySQL.html">¶</a>
+</h1>
+<p class="short_description">MySQL specific class</p>
+<div class="details collapse"></div>
+<a href="../classes/MySQL.html" class="more">« More »</a>
+</div>
+<a name="MySQL_SQL" id="MySQL_SQL"></a><div class="element ajax clickable class" href="../classes/MySQL_SQL.html">
+<h1>MySQL_SQL<a href="../classes/MySQL_SQL.html">¶</a>
+</h1>
+<p class="short_description">MySQL specifc SQL</p>
+<div class="details collapse"></div>
+<a href="../classes/MySQL_SQL.html" class="more">« More »</a>
+</div>
+<a name="MySQL_Util" id="MySQL_Util"></a><div class="element ajax clickable class" href="../classes/MySQL_Util.html">
+<h1>MySQL_Util<a href="../classes/MySQL_Util.html">¶</a>
+</h1>
+<p class="short_description">MySQL-specific backup, import and creation methods</p>
+<div class="details collapse"></div>
+<a href="../classes/MySQL_Util.html" class="more">« More »</a>
+</div>
+<a name="ODBC" id="ODBC"></a><div class="element ajax clickable class" href="../classes/ODBC.html">
+<h1>ODBC<a href="../classes/ODBC.html">¶</a>
+</h1>
+<p class="short_description">ODBC Database Driver</p>
+<div class="details collapse"></div>
+<a href="../classes/ODBC.html" class="more">« More »</a>
+</div>
+<a name="ODBC_SQL" id="ODBC_SQL"></a><div class="element ajax clickable class" href="../classes/ODBC_SQL.html">
+<h1>ODBC_SQL<a href="../classes/ODBC_SQL.html">¶</a>
+</h1>
+<p class="short_description">ODBC SQL Class</p>
+<div class="details collapse"></div>
+<a href="../classes/ODBC_SQL.html" class="more">« More »</a>
+</div>
+<a name="ODBC_Util" id="ODBC_Util"></a><div class="element ajax clickable class" href="../classes/ODBC_Util.html">
+<h1>ODBC_Util<a href="../classes/ODBC_Util.html">¶</a>
+</h1>
+<p class="short_description">ODBC-specific backup, import and creation methods</p>
+<div class="details collapse"></div>
+<a href="../classes/ODBC_Util.html" class="more">« More »</a>
+</div>
+<a name="PgSQL" id="PgSQL"></a><div class="element ajax clickable class" href="../classes/PgSQL.html">
+<h1>PgSQL<a href="../classes/PgSQL.html">¶</a>
+</h1>
+<p class="short_description">PostgreSQL specifc class</p>
+<div class="details collapse"></div>
+<a href="../classes/PgSQL.html" class="more">« More »</a>
+</div>
+<a name="PgSQL_SQL" id="PgSQL_SQL"></a><div class="element ajax clickable class" href="../classes/PgSQL_SQL.html">
+<h1>PgSQL_SQL<a href="../classes/PgSQL_SQL.html">¶</a>
+</h1>
+<p class="short_description">PostgreSQL specifc SQL</p>
+<div class="details collapse"></div>
+<a href="../classes/PgSQL_SQL.html" class="more">« More »</a>
+</div>
+<a name="PgSQL_Util" id="PgSQL_Util"></a><div class="element ajax clickable class" href="../classes/PgSQL_Util.html">
+<h1>PgSQL_Util<a href="../classes/PgSQL_Util.html">¶</a>
+</h1>
+<p class="short_description">Posgres-specific backup, import and creation methods</p>
+<div class="details collapse"></div>
+<a href="../classes/PgSQL_Util.html" class="more">« More »</a>
+</div>
+<a name="SQLite" id="SQLite"></a><div class="element ajax clickable class" href="../classes/SQLite.html">
+<h1>SQLite<a href="../classes/SQLite.html">¶</a>
+</h1>
+<p class="short_description">SQLite specific class</p>
+<div class="details collapse"></div>
+<a href="../classes/SQLite.html" class="more">« More »</a>
+</div>
+<a name="SQLite_SQL" id="SQLite_SQL"></a><div class="element ajax clickable class" href="../classes/SQLite_SQL.html">
+<h1>SQLite_SQL<a href="../classes/SQLite_SQL.html">¶</a>
+</h1>
+<p class="short_description">SQLite Specific SQL</p>
+<div class="details collapse"></div>
+<a href="../classes/SQLite_SQL.html" class="more">« More »</a>
+</div>
+<a name="SQLite_Util" id="SQLite_Util"></a><div class="element ajax clickable class" href="../classes/SQLite_Util.html">
+<h1>SQLite_Util<a href="../classes/SQLite_Util.html">¶</a>
+</h1>
+<p class="short_description">SQLite-specific backup, import and creation methods</p>
+<div class="details collapse"></div>
+<a href="../classes/SQLite_Util.html" class="more">« More »</a>
+</div>
+</div>
+</div>
+</div>
+<div class="row"><footer class="span12">
+            Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
+            Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
+            generated on 2012-04-20T13:27:44-04:00.<br></footer></div>
+</div>
+</body>
+</html>
diff --git a/docs/packages/Query.Helper Classes.html b/docs/packages/Query.Helper Classes.html
new file mode 100644
index 0000000..384afe9
--- /dev/null
+++ b/docs/packages/Query.Helper Classes.html	
@@ -0,0 +1,103 @@
+<!DOCTYPE html><html xmlns:date="http://exslt.org/dates-and-times" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;">
+<meta charset="utf-8">
+<title>OpenSQLManager » Query\Helper Classes</title>
+<meta name="author" content="Mike van Riel">
+<meta name="description" content="">
+<link href="../css/template.css" rel="stylesheet" media="all">
+<script src="../js/jquery-1.7.1.min.js" type="text/javascript"></script><script src="../js/jquery-ui-1.8.2.custom.min.js" type="text/javascript"></script><script src="../js/jquery.mousewheel.min.js" type="text/javascript"></script><script src="../js/bootstrap.js" type="text/javascript"></script><script src="../js/template.js" type="text/javascript"></script><script src="../js/prettify/prettify.min.js" type="text/javascript"></script><link rel="shortcut icon" href="../img/favicon.ico">
+<link rel="apple-touch-icon" href="../img/apple-touch-icon.png">
+<link rel="apple-touch-icon" sizes="72x72" href="../img/apple-touch-icon-72x72.png">
+<link rel="apple-touch-icon" sizes="114x114" href="../img/apple-touch-icon-114x114.png">
+</head>
+<body>
+<div class="navbar navbar-fixed-top">
+<div class="navbar-inner"><div class="container">
+<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
+<li class="dropdown">
+<a href="#api" class="dropdown-toggle" data-toggle="dropdown">
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
+</li>
+<li class="dropdown" id="charts-menu">
+<a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
+                                    Charts <b class="caret"></b></a><ul class="dropdown-menu"><li><a href="../graph_class.html"><i class="icon-list-alt"></i> Class hierarchy diagram</a></li></ul>
+</li>
+<li class="dropdown" id="reports-menu">
+<a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
+                                    Reports <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a href="../errors.html"><i class="icon-remove-sign"></i> Errors 
+                <span class="label label-info">0</span></a></li>
+<li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
+                <ul></ul></a></li>
+<li><a href="../deprecated.html"><i class="icon-stop"></i> Deprecated elements 
+                <span class="label label-info">0</span></a></li>
+</ul>
+</li>
+</ul></div>
+</div></div>
+<div class="go_to_top"><a href="#___" style="color: inherit">Back to top  <i class="icon-upload icon-white"></i></a></div>
+</div>
+<div id="___" class="container">
+<noscript><div class="alert alert-warning">
+                            Javascript is disabled; several features are only available
+                            if Javascript is enabled.
+                        </div></noscript>
+<div class="row">
+<div class="span4">
+<div class="btn-group view pull-right" data-toggle="buttons-radio">
+<button class="btn details" title="Show descriptions and method names"><i class="icon-list"></i></button><button class="btn simple" title="Show only method names"><i class="icon-align-justify"></i></button>
+</div>
+<ul class="side-nav nav nav-list">
+<li class="nav-header">
+<i class="icon-map-marker"></i> Packages</li>
+<li>
+<a href="../packages/Query.Helper%20Classes.html" title="Helper Classes"><i class="icon-folder-open"></i>Helper Classes</a><ul class="nav nav-list nav-packages"></ul>
+</li>
+<li class="nav-header">
+<i class="icon-custom icon-class"></i> Classes</li>
+<li><a href="#DB_Reg" title="Connection registry">DB_Reg</a></li>
+<li><a href="#Settings" title="Class for manipulating datbase connections, and miscellaneous settings">Settings</a></li>
+</ul>
+</div>
+<div class="span8 package-contents">
+<ul class="breadcrumb">
+<li>
+<a href="../index.html"><i class="icon-folder-open"></i></a><span class="divider">\</span>
+</li>
+<li><a href="../packages/Query.html">Query</a></li>
+<span class="divider">\</span><li class="active"><a href="../packages/Query.Helper%20Classes.html">Helper Classes</a></li>
+</ul>
+<div class="package-indent">
+<h3>
+<i class="icon-custom icon-class"></i> Classes and interfaces</h3>
+<a name="DB_Reg" id="DB_Reg"></a><div class="element ajax clickable class" href="../classes/DB_Reg.html">
+<h1>DB_Reg<a href="../classes/DB_Reg.html">¶</a>
+</h1>
+<p class="short_description">Connection registry</p>
+<div class="details collapse"></div>
+<a href="../classes/DB_Reg.html" class="more">« More »</a>
+</div>
+<a name="Settings" id="Settings"></a><div class="element ajax clickable class" href="../classes/Settings.html">
+<h1>Settings<a href="../classes/Settings.html">¶</a>
+</h1>
+<p class="short_description">Class for manipulating datbase connections, and miscellaneous settings</p>
+<div class="details collapse"></div>
+<a href="../classes/Settings.html" class="more">« More »</a>
+</div>
+</div>
+</div>
+</div>
+<div class="row"><footer class="span12">
+            Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
+            Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
+            generated on 2012-04-20T13:27:44-04:00.<br></footer></div>
+</div>
+</body>
+</html>
diff --git a/docs/packages/Query.Query.html b/docs/packages/Query.Query.html
new file mode 100644
index 0000000..2a37539
--- /dev/null
+++ b/docs/packages/Query.Query.html
@@ -0,0 +1,121 @@
+<!DOCTYPE html><html xmlns:date="http://exslt.org/dates-and-times" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;">
+<meta charset="utf-8">
+<title>OpenSQLManager » Query\Query</title>
+<meta name="author" content="Mike van Riel">
+<meta name="description" content="">
+<link href="../css/template.css" rel="stylesheet" media="all">
+<script src="../js/jquery-1.7.1.min.js" type="text/javascript"></script><script src="../js/jquery-ui-1.8.2.custom.min.js" type="text/javascript"></script><script src="../js/jquery.mousewheel.min.js" type="text/javascript"></script><script src="../js/bootstrap.js" type="text/javascript"></script><script src="../js/template.js" type="text/javascript"></script><script src="../js/prettify/prettify.min.js" type="text/javascript"></script><link rel="shortcut icon" href="../img/favicon.ico">
+<link rel="apple-touch-icon" href="../img/apple-touch-icon.png">
+<link rel="apple-touch-icon" sizes="72x72" href="../img/apple-touch-icon-72x72.png">
+<link rel="apple-touch-icon" sizes="114x114" href="../img/apple-touch-icon-114x114.png">
+</head>
+<body>
+<div class="navbar navbar-fixed-top">
+<div class="navbar-inner"><div class="container">
+<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
+<li class="dropdown">
+<a href="#api" class="dropdown-toggle" data-toggle="dropdown">
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
+</li>
+<li class="dropdown" id="charts-menu">
+<a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
+                                    Charts <b class="caret"></b></a><ul class="dropdown-menu"><li><a href="../graph_class.html"><i class="icon-list-alt"></i> Class hierarchy diagram</a></li></ul>
+</li>
+<li class="dropdown" id="reports-menu">
+<a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
+                                    Reports <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a href="../errors.html"><i class="icon-remove-sign"></i> Errors 
+                <span class="label label-info">0</span></a></li>
+<li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
+                <ul></ul></a></li>
+<li><a href="../deprecated.html"><i class="icon-stop"></i> Deprecated elements 
+                <span class="label label-info">0</span></a></li>
+</ul>
+</li>
+</ul></div>
+</div></div>
+<div class="go_to_top"><a href="#___" style="color: inherit">Back to top  <i class="icon-upload icon-white"></i></a></div>
+</div>
+<div id="___" class="container">
+<noscript><div class="alert alert-warning">
+                            Javascript is disabled; several features are only available
+                            if Javascript is enabled.
+                        </div></noscript>
+<div class="row">
+<div class="span4">
+<div class="btn-group view pull-right" data-toggle="buttons-radio">
+<button class="btn details" title="Show descriptions and method names"><i class="icon-list"></i></button><button class="btn simple" title="Show only method names"><i class="icon-align-justify"></i></button>
+</div>
+<ul class="side-nav nav nav-list">
+<li class="nav-header">
+<i class="icon-map-marker"></i> Packages</li>
+<li>
+<a href="../packages/Query.Query.html" title="Query"><i class="icon-folder-open"></i>Query</a><ul class="nav nav-list nav-packages"></ul>
+</li>
+<li class="nav-header">
+<i class="icon-custom icon-class"></i> Classes</li>
+<li><a href="#DB_SQL" title="Abstract parent for database manipulation subclasses">DB_SQL</a></li>
+<li><a href="#DB_PDO" title="Base Database class">DB_PDO</a></li>
+<li><a href="#Query_Builder" title="Convienience class for creating sql queries - also the class that
+instantiates the specific db driver">Query_Builder</a></li>
+<li><a href="#DB_Util" title="Abstract class defining database / table creation methods">DB_Util</a></li>
+</ul>
+</div>
+<div class="span8 package-contents">
+<ul class="breadcrumb">
+<li>
+<a href="../index.html"><i class="icon-folder-open"></i></a><span class="divider">\</span>
+</li>
+<li><a href="../packages/Query.html">Query</a></li>
+<span class="divider">\</span><li class="active"><a href="../packages/Query.Query.html">Query</a></li>
+</ul>
+<div class="package-indent">
+<h3>
+<i class="icon-custom icon-class"></i> Classes and interfaces</h3>
+<a name="DB_PDO" id="DB_PDO"></a><div class="element ajax clickable class" href="../classes/DB_PDO.html">
+<h1>DB_PDO<a href="../classes/DB_PDO.html">¶</a>
+</h1>
+<p class="short_description">Base Database class</p>
+<div class="details collapse"></div>
+<a href="../classes/DB_PDO.html" class="more">« More »</a>
+</div>
+<a name="DB_SQL" id="DB_SQL"></a><div class="element ajax clickable class" href="../classes/DB_SQL.html">
+<h1>DB_SQL<a href="../classes/DB_SQL.html">¶</a>
+</h1>
+<p class="short_description">Abstract parent for database manipulation subclasses</p>
+<div class="details collapse"></div>
+<a href="../classes/DB_SQL.html" class="more">« More »</a>
+</div>
+<a name="DB_Util" id="DB_Util"></a><div class="element ajax clickable class" href="../classes/DB_Util.html">
+<h1>DB_Util<a href="../classes/DB_Util.html">¶</a>
+</h1>
+<p class="short_description">Abstract class defining database / table creation methods</p>
+<div class="details collapse"></div>
+<a href="../classes/DB_Util.html" class="more">« More »</a>
+</div>
+<a name="Query_Builder" id="Query_Builder"></a><div class="element ajax clickable class" href="../classes/Query_Builder.html">
+<h1>Query_Builder<a href="../classes/Query_Builder.html">¶</a>
+</h1>
+<p class="short_description">Convienience class for creating sql queries - also the class that
+instantiates the specific db driver</p>
+<div class="details collapse"></div>
+<a href="../classes/Query_Builder.html" class="more">« More »</a>
+</div>
+</div>
+</div>
+</div>
+<div class="row"><footer class="span12">
+            Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
+            Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
+            generated on 2012-04-20T13:27:44-04:00.<br></footer></div>
+</div>
+</body>
+</html>
diff --git a/docs/packages/Query.html b/docs/packages/Query.html
new file mode 100644
index 0000000..3244ae0
--- /dev/null
+++ b/docs/packages/Query.html
@@ -0,0 +1,322 @@
+<!DOCTYPE html><html xmlns:date="http://exslt.org/dates-and-times" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;">
+<meta charset="utf-8">
+<title>OpenSQLManager » Query</title>
+<meta name="author" content="Mike van Riel">
+<meta name="description" content="">
+<link href="../css/template.css" rel="stylesheet" media="all">
+<script src="../js/jquery-1.7.1.min.js" type="text/javascript"></script><script src="../js/jquery-ui-1.8.2.custom.min.js" type="text/javascript"></script><script src="../js/jquery.mousewheel.min.js" type="text/javascript"></script><script src="../js/bootstrap.js" type="text/javascript"></script><script src="../js/template.js" type="text/javascript"></script><script src="../js/prettify/prettify.min.js" type="text/javascript"></script><link rel="shortcut icon" href="../img/favicon.ico">
+<link rel="apple-touch-icon" href="../img/apple-touch-icon.png">
+<link rel="apple-touch-icon" sizes="72x72" href="../img/apple-touch-icon-72x72.png">
+<link rel="apple-touch-icon" sizes="114x114" href="../img/apple-touch-icon-114x114.png">
+</head>
+<body>
+<div class="navbar navbar-fixed-top">
+<div class="navbar-inner"><div class="container">
+<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a><a class="brand" href="../index.html">OpenSQLManager</a><div class="nav-collapse"><ul class="nav">
+<li class="dropdown">
+<a href="#api" class="dropdown-toggle" data-toggle="dropdown">
+                                    API Documentation <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a>Packages</a></li>
+<li><a href="../packages/Default.html"><i class="icon-folder-open"></i> Default</a></li>
+<li><a href="../packages/OpenSQLManager.html"><i class="icon-folder-open"></i> OpenSQLManager</a></li>
+<li><a href="../packages/Query.html"><i class="icon-folder-open"></i> Query</a></li>
+</ul>
+</li>
+<li class="dropdown" id="charts-menu">
+<a href="#charts" class="dropdown-toggle" data-toggle="dropdown">
+                                    Charts <b class="caret"></b></a><ul class="dropdown-menu"><li><a href="../graph_class.html"><i class="icon-list-alt"></i> Class hierarchy diagram</a></li></ul>
+</li>
+<li class="dropdown" id="reports-menu">
+<a href="#reports" class="dropdown-toggle" data-toggle="dropdown">
+                                    Reports <b class="caret"></b></a><ul class="dropdown-menu">
+<li><a href="../errors.html"><i class="icon-remove-sign"></i> Errors 
+                <span class="label label-info">0</span></a></li>
+<li><a href="../markers.html"><i class="icon-map-marker"></i> Markers 
+                <ul></ul></a></li>
+<li><a href="../deprecated.html"><i class="icon-stop"></i> Deprecated elements 
+                <span class="label label-info">0</span></a></li>
+</ul>
+</li>
+</ul></div>
+</div></div>
+<div class="go_to_top"><a href="#___" style="color: inherit">Back to top  <i class="icon-upload icon-white"></i></a></div>
+</div>
+<div id="___" class="container">
+<noscript><div class="alert alert-warning">
+                            Javascript is disabled; several features are only available
+                            if Javascript is enabled.
+                        </div></noscript>
+<div class="row">
+<div class="span4">
+<div class="btn-group view pull-right" data-toggle="buttons-radio">
+<button class="btn details" title="Show descriptions and method names"><i class="icon-list"></i></button><button class="btn simple" title="Show only method names"><i class="icon-align-justify"></i></button>
+</div>
+<ul class="side-nav nav nav-list">
+<li class="nav-header">
+<i class="icon-map-marker"></i> Packages</li>
+<li>
+<a href="../packages/Query.html" title="Query"><i class="icon-folder-open"></i>Query</a><ul class="nav nav-list nav-packages">
+<li>
+<a href="../packages/Query.Drivers.html" title="Drivers"><i class="icon-folder-open"></i>Drivers</a><ul class="nav nav-list nav-packages"></ul>
+</li>
+<li>
+<a href="../packages/Query.Helper%20Classes.html" title="Helper Classes"><i class="icon-folder-open"></i>Helper Classes</a><ul class="nav nav-list nav-packages"></ul>
+</li>
+<li>
+<a href="../packages/Query.Query.html" title="Query"><i class="icon-folder-open"></i>Query</a><ul class="nav nav-list nav-packages"></ul>
+</li>
+</ul>
+</li>
+<li class="nav-header">
+<i class="icon-custom icon-function"></i> Functions</li>
+<li class="function  "><a href="#db_filter" title="db_filter :: Filter out db rows into one array"><span class="description">Filter out db rows into one array</span><pre>db_filter</pre></a></li>
+<li class="function  "><a href="#do_include" title="do_include :: Bulk directory loading workaround for use
+with array_map and glob"><span class="description">Bulk directory loading workaround for use
+with array_map and glob</span><pre>do_include</pre></a></li>
+</ul>
+</div>
+<div class="span8 package-contents">
+<ul class="breadcrumb">
+<li>
+<a href="../index.html"><i class="icon-folder-open"></i></a><span class="divider">\</span>
+</li>
+<li class="active"><a href="../packages/Query.html">Query</a></li>
+</ul>
+<div class="package-indent">
+<h3>
+<i class="icon-custom icon-function"></i> Functions</h3>
+<a name="db_filter" id="db_filter"></a><div class="element clickable function  db_filter" data-toggle="collapse" data-target=".db_filter .collapse">
+<h2>Filter out db rows into one array</h2>
+<pre>db_filter(array $array, mixed $index) : array</pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8">
+<p class="long_description"></p>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$array</h4>
+<code>array</code>
+</div>
+<div class="subelement argument">
+<h4>$index</h4>
+<code>mixed</code>
+</div>
+<h3>Returns</h3>
+<div class="subelement response"><code>array</code></div>
+</div></div>
+</div>
+<a name="do_include" id="do_include"></a><div class="element clickable function  do_include" data-toggle="collapse" data-target=".do_include .collapse">
+<h2>Bulk directory loading workaround for use
+with array_map and glob</h2>
+<pre>do_include(string $path) : void</pre>
+<div class="labels"></div>
+<div class="row collapse"><div class="span8">
+<p class="long_description"></p>
+<h3>Parameters</h3>
+<div class="subelement argument">
+<h4>$path</h4>
+<code>string</code>
+</div>
+</div></div>
+</div>
+<ul class="breadcrumb">
+<li>
+<a href="../index.html"><i class="icon-folder-open"></i></a><span class="divider">\</span>
+</li>
+<li><a href="../packages/Query.html">Query</a></li>
+<span class="divider">\</span><li class="active"><a href="../packages/Query.Drivers.html">Drivers</a></li>
+</ul>
+<div class="package-indent">
+<h3>
+<i class="icon-custom icon-class"></i> Classes and interfaces</h3>
+<a name="Firebird" id="Firebird"></a><div class="element ajax clickable class" href="../classes/Firebird.html">
+<h1>Firebird<a href="../classes/Firebird.html">¶</a>
+</h1>
+<p class="short_description">Firebird Database class</p>
+<div class="details collapse"></div>
+<a href="../classes/Firebird.html" class="more">« More »</a>
+</div>
+<a name="Firebird_Result" id="Firebird_Result"></a><div class="element ajax clickable class" href="../classes/Firebird_Result.html">
+<h1>Firebird_Result<a href="../classes/Firebird_Result.html">¶</a>
+</h1>
+<p class="short_description">Firebird result class to emulate PDOStatement Class - only implements
+data-fetching methods</p>
+<div class="details collapse"></div>
+<a href="../classes/Firebird_Result.html" class="more">« More »</a>
+</div>
+<a name="Firebird_SQL" id="Firebird_SQL"></a><div class="element ajax clickable class" href="../classes/Firebird_SQL.html">
+<h1>Firebird_SQL<a href="../classes/Firebird_SQL.html">¶</a>
+</h1>
+<p class="short_description">Firebird Specific SQL</p>
+<div class="details collapse"></div>
+<a href="../classes/Firebird_SQL.html" class="more">« More »</a>
+</div>
+<a name="Firebird_Util" id="Firebird_Util"></a><div class="element ajax clickable class" href="../classes/Firebird_Util.html">
+<h1>Firebird_Util<a href="../classes/Firebird_Util.html">¶</a>
+</h1>
+<p class="short_description">Firebird-specific backup, import and creation methods</p>
+<div class="details collapse"></div>
+<a href="../classes/Firebird_Util.html" class="more">« More »</a>
+</div>
+<a name="MySQL" id="MySQL"></a><div class="element ajax clickable class" href="../classes/MySQL.html">
+<h1>MySQL<a href="../classes/MySQL.html">¶</a>
+</h1>
+<p class="short_description">MySQL specific class</p>
+<div class="details collapse"></div>
+<a href="../classes/MySQL.html" class="more">« More »</a>
+</div>
+<a name="MySQL_SQL" id="MySQL_SQL"></a><div class="element ajax clickable class" href="../classes/MySQL_SQL.html">
+<h1>MySQL_SQL<a href="../classes/MySQL_SQL.html">¶</a>
+</h1>
+<p class="short_description">MySQL specifc SQL</p>
+<div class="details collapse"></div>
+<a href="../classes/MySQL_SQL.html" class="more">« More »</a>
+</div>
+<a name="MySQL_Util" id="MySQL_Util"></a><div class="element ajax clickable class" href="../classes/MySQL_Util.html">
+<h1>MySQL_Util<a href="../classes/MySQL_Util.html">¶</a>
+</h1>
+<p class="short_description">MySQL-specific backup, import and creation methods</p>
+<div class="details collapse"></div>
+<a href="../classes/MySQL_Util.html" class="more">« More »</a>
+</div>
+<a name="ODBC" id="ODBC"></a><div class="element ajax clickable class" href="../classes/ODBC.html">
+<h1>ODBC<a href="../classes/ODBC.html">¶</a>
+</h1>
+<p class="short_description">ODBC Database Driver</p>
+<div class="details collapse"></div>
+<a href="../classes/ODBC.html" class="more">« More »</a>
+</div>
+<a name="ODBC_SQL" id="ODBC_SQL"></a><div class="element ajax clickable class" href="../classes/ODBC_SQL.html">
+<h1>ODBC_SQL<a href="../classes/ODBC_SQL.html">¶</a>
+</h1>
+<p class="short_description">ODBC SQL Class</p>
+<div class="details collapse"></div>
+<a href="../classes/ODBC_SQL.html" class="more">« More »</a>
+</div>
+<a name="ODBC_Util" id="ODBC_Util"></a><div class="element ajax clickable class" href="../classes/ODBC_Util.html">
+<h1>ODBC_Util<a href="../classes/ODBC_Util.html">¶</a>
+</h1>
+<p class="short_description">ODBC-specific backup, import and creation methods</p>
+<div class="details collapse"></div>
+<a href="../classes/ODBC_Util.html" class="more">« More »</a>
+</div>
+<a name="PgSQL" id="PgSQL"></a><div class="element ajax clickable class" href="../classes/PgSQL.html">
+<h1>PgSQL<a href="../classes/PgSQL.html">¶</a>
+</h1>
+<p class="short_description">PostgreSQL specifc class</p>
+<div class="details collapse"></div>
+<a href="../classes/PgSQL.html" class="more">« More »</a>
+</div>
+<a name="PgSQL_SQL" id="PgSQL_SQL"></a><div class="element ajax clickable class" href="../classes/PgSQL_SQL.html">
+<h1>PgSQL_SQL<a href="../classes/PgSQL_SQL.html">¶</a>
+</h1>
+<p class="short_description">PostgreSQL specifc SQL</p>
+<div class="details collapse"></div>
+<a href="../classes/PgSQL_SQL.html" class="more">« More »</a>
+</div>
+<a name="PgSQL_Util" id="PgSQL_Util"></a><div class="element ajax clickable class" href="../classes/PgSQL_Util.html">
+<h1>PgSQL_Util<a href="../classes/PgSQL_Util.html">¶</a>
+</h1>
+<p class="short_description">Posgres-specific backup, import and creation methods</p>
+<div class="details collapse"></div>
+<a href="../classes/PgSQL_Util.html" class="more">« More »</a>
+</div>
+<a name="SQLite" id="SQLite"></a><div class="element ajax clickable class" href="../classes/SQLite.html">
+<h1>SQLite<a href="../classes/SQLite.html">¶</a>
+</h1>
+<p class="short_description">SQLite specific class</p>
+<div class="details collapse"></div>
+<a href="../classes/SQLite.html" class="more">« More »</a>
+</div>
+<a name="SQLite_SQL" id="SQLite_SQL"></a><div class="element ajax clickable class" href="../classes/SQLite_SQL.html">
+<h1>SQLite_SQL<a href="../classes/SQLite_SQL.html">¶</a>
+</h1>
+<p class="short_description">SQLite Specific SQL</p>
+<div class="details collapse"></div>
+<a href="../classes/SQLite_SQL.html" class="more">« More »</a>
+</div>
+<a name="SQLite_Util" id="SQLite_Util"></a><div class="element ajax clickable class" href="../classes/SQLite_Util.html">
+<h1>SQLite_Util<a href="../classes/SQLite_Util.html">¶</a>
+</h1>
+<p class="short_description">SQLite-specific backup, import and creation methods</p>
+<div class="details collapse"></div>
+<a href="../classes/SQLite_Util.html" class="more">« More »</a>
+</div>
+</div>
+<ul class="breadcrumb">
+<li>
+<a href="../index.html"><i class="icon-folder-open"></i></a><span class="divider">\</span>
+</li>
+<li><a href="../packages/Query.html">Query</a></li>
+<span class="divider">\</span><li class="active"><a href="../packages/Query.Helper%20Classes.html">Helper Classes</a></li>
+</ul>
+<div class="package-indent">
+<h3>
+<i class="icon-custom icon-class"></i> Classes and interfaces</h3>
+<a name="DB_Reg" id="DB_Reg"></a><div class="element ajax clickable class" href="../classes/DB_Reg.html">
+<h1>DB_Reg<a href="../classes/DB_Reg.html">¶</a>
+</h1>
+<p class="short_description">Connection registry</p>
+<div class="details collapse"></div>
+<a href="../classes/DB_Reg.html" class="more">« More »</a>
+</div>
+<a name="Settings" id="Settings"></a><div class="element ajax clickable class" href="../classes/Settings.html">
+<h1>Settings<a href="../classes/Settings.html">¶</a>
+</h1>
+<p class="short_description">Class for manipulating datbase connections, and miscellaneous settings</p>
+<div class="details collapse"></div>
+<a href="../classes/Settings.html" class="more">« More »</a>
+</div>
+</div>
+<ul class="breadcrumb">
+<li>
+<a href="../index.html"><i class="icon-folder-open"></i></a><span class="divider">\</span>
+</li>
+<li><a href="../packages/Query.html">Query</a></li>
+<span class="divider">\</span><li class="active"><a href="../packages/Query.Query.html">Query</a></li>
+</ul>
+<div class="package-indent">
+<h3>
+<i class="icon-custom icon-class"></i> Classes and interfaces</h3>
+<a name="DB_PDO" id="DB_PDO"></a><div class="element ajax clickable class" href="../classes/DB_PDO.html">
+<h1>DB_PDO<a href="../classes/DB_PDO.html">¶</a>
+</h1>
+<p class="short_description">Base Database class</p>
+<div class="details collapse"></div>
+<a href="../classes/DB_PDO.html" class="more">« More »</a>
+</div>
+<a name="DB_SQL" id="DB_SQL"></a><div class="element ajax clickable class" href="../classes/DB_SQL.html">
+<h1>DB_SQL<a href="../classes/DB_SQL.html">¶</a>
+</h1>
+<p class="short_description">Abstract parent for database manipulation subclasses</p>
+<div class="details collapse"></div>
+<a href="../classes/DB_SQL.html" class="more">« More »</a>
+</div>
+<a name="DB_Util" id="DB_Util"></a><div class="element ajax clickable class" href="../classes/DB_Util.html">
+<h1>DB_Util<a href="../classes/DB_Util.html">¶</a>
+</h1>
+<p class="short_description">Abstract class defining database / table creation methods</p>
+<div class="details collapse"></div>
+<a href="../classes/DB_Util.html" class="more">« More »</a>
+</div>
+<a name="Query_Builder" id="Query_Builder"></a><div class="element ajax clickable class" href="../classes/Query_Builder.html">
+<h1>Query_Builder<a href="../classes/Query_Builder.html">¶</a>
+</h1>
+<p class="short_description">Convienience class for creating sql queries - also the class that
+instantiates the specific db driver</p>
+<div class="details collapse"></div>
+<a href="../classes/Query_Builder.html" class="more">« More »</a>
+</div>
+</div>
+</div>
+</div>
+</div>
+<div class="row"><footer class="span12">
+            Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by <a href="http://glyphicons.com/">Glyphicons</a>.<br>
+            Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor 2.0.0a2</a> and<br>
+            generated on 2012-04-20T13:27:44-04:00.<br></footer></div>
+</div>
+</body>
+</html>
diff --git a/docs/structure.xml b/docs/structure.xml
index d0d607f..1621d3b 100644
--- a/docs/structure.xml
+++ b/docs/structure.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <project version="2.0.0a2" title="OpenSQLManager">
-  <file path="sys/db/classes/db_reg.php" hash="3ecb4dc76cb6487a3c7a0ec5bd68b2bb" package="Default">
+  <file path="sys/db/classes/db_reg.php" hash="4db07479d2dfdd5a403c7ffae83ceb23" package="Default">
     <docblock line="2">
       <description><![CDATA[Query]]></description>
       <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
@@ -9,7 +9,7 @@
       <tag line="2" name="link" description="https://github.com/aviat4ion/Query" link="https://github.com/aviat4ion/Query"/>
       <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
     </docblock>
-    <class final="false" abstract="false" namespace="default" line="21" package="Default">
+    <class final="false" abstract="false" namespace="default" line="24" package="Query\Helper Classes">
       <name>DB_Reg</name>
       <full_name>\DB_Reg</full_name>
       <extends/>
@@ -17,75 +17,77 @@
         <description><![CDATA[Connection registry]]></description>
         <long-description><![CDATA[<p>Decouples the Settings class from the query builder
 and organizes database connections</p>]]></long-description>
+        <tag line="15" name="package" description="Query"/>
+        <tag line="15" name="subpackage" description="Helper Classes"/>
       </docblock>
-      <property final="false" static="true" visibility="private" line="26" package="Default">
+      <property final="false" static="true" visibility="private" line="29" package="Default">
         <name>$instance</name>
         <default><![CDATA[array()]]></default>
-        <docblock line="23">
+        <docblock line="26">
           <description><![CDATA[Static array of connections]]></description>
           <long-description><![CDATA[]]></long-description>
         </docblock>
       </property>
-      <method final="false" abstract="false" static="true" visibility="public" namespace="default" line="34" package="">
+      <method final="false" abstract="false" static="true" visibility="public" namespace="default" line="37" package="">
         <name>get_db</name>
         <type>function</type>
-        <docblock line="28">
+        <docblock line="31">
           <description><![CDATA[Registry access method]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="28" name="param" description="" type="string" variable="$key">
+          <tag line="31" name="param" description="" type="string" variable="$key">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="28" name="return" description="" type="object">
+          <tag line="31" name="return" description="" type="object">
             <type by_reference="false">object</type>
           </tag>
         </docblock>
-        <argument line="34">
+        <argument line="37">
           <name>$key</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="52" package="">
+      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="55" package="">
         <name>__construct</name>
         <type>function</type>
-        <docblock line="47">
+        <docblock line="50">
           <description><![CDATA[Private constructor]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="47" name="param" description="" type="string" variable="$key">
+          <tag line="50" name="param" description="" type="string" variable="$key">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
-        <argument line="52">
+        <argument line="55">
           <name>$key</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="true" visibility="public" namespace="default" line="68" package="">
+      <method final="false" abstract="false" static="true" visibility="public" namespace="default" line="71" package="">
         <name>get_connections</name>
         <type>function</type>
-        <docblock line="63">
+        <docblock line="66">
           <description><![CDATA[Return exiting connections]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="63" name="return" description="" type="array">
+          <tag line="66" name="return" description="" type="array">
             <type by_reference="false">array</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="true" visibility="public" namespace="default" line="81" package="">
+      <method final="false" abstract="false" static="true" visibility="public" namespace="default" line="84" package="">
         <name>remove_db</name>
         <type>function</type>
-        <docblock line="75">
+        <docblock line="78">
           <description><![CDATA[Remove a database connection]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="75" name="param" description="" type="string" variable="$key">
+          <tag line="78" name="param" description="" type="string" variable="$key">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="75" name="return" description="" type="void">
+          <tag line="78" name="return" description="" type="void">
             <type by_reference="false">void</type>
           </tag>
         </docblock>
-        <argument line="81">
+        <argument line="84">
           <name>$key</name>
           <default><![CDATA[]]></default>
           <type/>
@@ -93,198 +95,201 @@ and organizes database connections</p>]]></long-description>
       </method>
     </class>
   </file>
-  <file path="sys/db/classes/settings.php" hash="bc583190579c14a480c318b5eb066cfd" package="Default">
+  <file path="sys/db/classes/settings.php" hash="69d30a582c8ec7f2a29151aab896ce1e" package="Query">
     <docblock line="2">
       <description><![CDATA[Query]]></description>
       <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
+      <tag line="2" name="package" description="Query"/>
       <tag line="2" name="author" description="Timothy J. Warren"/>
       <tag line="2" name="copyright" description="Copyright (c) 2012"/>
       <tag line="2" name="link" description="https://github.com/aviat4ion/Query" link="https://github.com/aviat4ion/Query"/>
       <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
     </docblock>
-    <class final="false" abstract="false" namespace="default" line="20" package="Default">
+    <class final="false" abstract="false" namespace="default" line="22" package="Query\Helper Classes">
       <name>Settings</name>
       <full_name>\Settings</full_name>
       <extends/>
-      <docblock line="15">
+      <docblock line="16">
         <description><![CDATA[Class for manipulating datbase connections, and miscellaneous settings]]></description>
-        <long-description><![CDATA[<p>Use JSON for compatibility</p>]]></long-description>
+        <long-description><![CDATA[]]></long-description>
+        <tag line="16" name="package" description="Query"/>
+        <tag line="16" name="subpackage" description="Helper Classes"/>
       </docblock>
-      <property final="false" static="false" visibility="private" line="25" package="Default">
+      <property final="false" static="false" visibility="private" line="27" package="Default">
         <name>$current</name>
         <default><![CDATA[]]></default>
-        <docblock line="22">
+        <docblock line="24">
           <description><![CDATA[Settings object represented by the currently loaded JSON file]]></description>
           <long-description><![CDATA[]]></long-description>
         </docblock>
       </property>
-      <property final="false" static="true" visibility="private" line="30" package="Default">
+      <property final="false" static="true" visibility="private" line="32" package="Default">
         <name>$instance</name>
         <default><![CDATA[]]></default>
-        <docblock line="27">
+        <docblock line="29">
           <description><![CDATA[Singleton instance]]></description>
           <long-description><![CDATA[]]></long-description>
         </docblock>
       </property>
-      <method final="false" abstract="false" static="true" visibility="public" namespace="default" line="38" package="">
+      <method final="false" abstract="false" static="true" visibility="public" namespace="default" line="40" package="">
         <name>get_instance</name>
         <type>function</type>
-        <docblock line="32">
+        <docblock line="34">
           <description><![CDATA[Static method to retreive current instance
 of the singleton]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="32" name="return" description="" type="\Settings">
+          <tag line="34" name="return" description="" type="\Settings">
             <type by_reference="false">\Settings</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="53" package="">
+      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="55" package="">
         <name>__construct</name>
         <type>function</type>
-        <docblock line="49">
+        <docblock line="51">
           <description><![CDATA[Load the settings file - private so it can't be loaded
 directly - the settings should be safe!]]></description>
           <long-description><![CDATA[]]></long-description>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="88" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="90" package="">
         <name>__destruct</name>
         <type>function</type>
-        <docblock line="85">
+        <docblock line="87">
           <description><![CDATA[Output the settings on destruct]]></description>
           <long-description><![CDATA[]]></long-description>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="105" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="107" package="">
         <name>__get</name>
         <type>function</type>
-        <docblock line="99">
+        <docblock line="101">
           <description><![CDATA[Magic method to simplify isset checking for config options]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="99" name="param" description="" type="string" variable="$key">
+          <tag line="101" name="param" description="" type="string" variable="$key">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="99" name="return" description="" type="mixed">
+          <tag line="101" name="return" description="" type="mixed">
             <type by_reference="false">mixed</type>
           </tag>
         </docblock>
-        <argument line="105">
+        <argument line="107">
           <name>$key</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="120" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="122" package="">
         <name>__set</name>
         <type>function</type>
-        <docblock line="114">
+        <docblock line="116">
           <description><![CDATA[Magic method to simplify setting config options]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="114" name="param" description="" type="string" variable="$key">
+          <tag line="116" name="param" description="" type="string" variable="$key">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="114" name="param" description="mixed" type="" variable="$val"/>
+          <tag line="116" name="param" description="mixed" type="" variable="$val"/>
         </docblock>
-        <argument line="120">
+        <argument line="122">
           <name>$key</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="120">
+        <argument line="122">
           <name>$val</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="139" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="141" package="">
         <name>add_db</name>
         <type>function</type>
-        <docblock line="133">
+        <docblock line="135">
           <description><![CDATA[Add a database connection]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="133" name="param" description="" type="string" variable="$name">
+          <tag line="135" name="param" description="" type="string" variable="$name">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="133" name="param" description="" type="array" variable="$params">
+          <tag line="135" name="param" description="" type="array" variable="$params">
             <type by_reference="false">array</type>
           </tag>
         </docblock>
-        <argument line="139">
+        <argument line="141">
           <name>$name</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="139">
+        <argument line="141">
           <name>$params</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="171" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="173" package="">
         <name>edit_db</name>
         <type>function</type>
-        <docblock line="165">
+        <docblock line="167">
           <description><![CDATA[Edit a database connection]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="165" name="param" description="" type="string" variable="$name">
+          <tag line="167" name="param" description="" type="string" variable="$name">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="165" name="param" description="" type="array" variable="$params">
+          <tag line="167" name="param" description="" type="array" variable="$params">
             <type by_reference="false">array</type>
           </tag>
         </docblock>
-        <argument line="171">
+        <argument line="173">
           <name>$name</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="171">
+        <argument line="173">
           <name>$params</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="214" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="216" package="">
         <name>remove_db</name>
         <type>function</type>
-        <docblock line="209">
+        <docblock line="211">
           <description><![CDATA[Remove a database connection]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="209" name="param" description="" type="string" variable="$name">
+          <tag line="211" name="param" description="" type="string" variable="$name">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
-        <argument line="214">
+        <argument line="216">
           <name>$name</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="235" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="237" package="">
         <name>get_dbs</name>
         <type>function</type>
-        <docblock line="230">
+        <docblock line="232">
           <description><![CDATA[Retreive all db connections]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="230" name="return" description="" type="array">
+          <tag line="232" name="return" description="" type="array">
             <type by_reference="false">array</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="248" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="250" package="">
         <name>get_db</name>
         <type>function</type>
-        <docblock line="242">
+        <docblock line="244">
           <description><![CDATA[Retreive a specific database connection]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="242" name="param" description="" type="string" variable="$name">
+          <tag line="244" name="param" description="" type="string" variable="$name">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="242" name="return" description="" type="object">
+          <tag line="244" name="return" description="" type="object">
             <type by_reference="false">object</type>
           </tag>
         </docblock>
-        <argument line="248">
+        <argument line="250">
           <name>$name</name>
           <default><![CDATA[]]></default>
           <type/>
@@ -292,7 +297,7 @@ directly - the settings should be safe!]]></description>
       </method>
     </class>
   </file>
-  <file path="sys/db/classes/db_sql.php" hash="0c64dbfafa6060298a5729483e91be45" package="Default">
+  <file path="sys/db/classes/db_sql.php" hash="ac302192ccf945708ea13bd46d7427ac" package="Query">
     <docblock line="2">
       <description><![CDATA[Query]]></description>
       <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
@@ -300,610 +305,616 @@ directly - the settings should be safe!]]></description>
       <tag line="2" name="copyright" description="Copyright (c) 2012"/>
       <tag line="2" name="link" description="https://github.com/aviat4ion/Query" link="https://github.com/aviat4ion/Query"/>
       <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
+      <tag line="2" name="package" description="Query"/>
     </docblock>
-    <class final="false" abstract="true" namespace="default" line="18" package="Default">
+    <class final="false" abstract="true" namespace="default" line="22" package="Query\Query">
       <name>DB_SQL</name>
       <full_name>\DB_SQL</full_name>
       <extends/>
-      <docblock line="15">
+      <docblock line="16">
         <description><![CDATA[Abstract parent for database manipulation subclasses]]></description>
         <long-description><![CDATA[]]></long-description>
+        <tag line="16" name="package" description="Query"/>
+        <tag line="16" name="subpackage" description="Query"/>
       </docblock>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="29" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="33" package="">
         <name>max</name>
         <type>function</type>
-        <docblock line="24">
+        <docblock line="28">
           <description><![CDATA[Get the max keyword sql]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="24" name="return" description="" type="string">
+          <tag line="28" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="41" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="45" package="">
         <name>min</name>
         <type>function</type>
-        <docblock line="36">
+        <docblock line="40">
           <description><![CDATA[Get the min keyword sql]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="36" name="return" description="" type="string">
+          <tag line="40" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="53" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="57" package="">
         <name>distinct</name>
         <type>function</type>
-        <docblock line="48">
+        <docblock line="52">
           <description><![CDATA[Get the 'distinct' keyword]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="48" name="return" description="" type="string">
+          <tag line="52" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="65" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="69" package="">
         <name>avg</name>
         <type>function</type>
-        <docblock line="60">
+        <docblock line="64">
           <description><![CDATA[Get the 'average' keyword]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="60" name="return" description="" type="string">
+          <tag line="64" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="77" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="81" package="">
         <name>sum</name>
         <type>function</type>
-        <docblock line="72">
+        <docblock line="76">
           <description><![CDATA[Get the 'sum' keyword]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="72" name="return" description="" type="string">
+          <tag line="76" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="95" package="">
+      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="99" package="">
         <name>limit</name>
         <type>function</type>
-        <docblock line="86">
+        <docblock line="90">
           <description><![CDATA[Get database specific sql for limit clause]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="86" name="abstract" description=""/>
-          <tag line="86" name="param" description="" type="string" variable="$sql">
+          <tag line="90" name="abstract" description=""/>
+          <tag line="90" name="param" description="" type="string" variable="$sql">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="86" name="param" description="" type="int" variable="$limit">
+          <tag line="90" name="param" description="" type="int" variable="$limit">
             <type by_reference="false">int</type>
           </tag>
-          <tag line="86" name="param" description="" type="int" variable="$offset">
+          <tag line="90" name="param" description="" type="int" variable="$offset">
             <type by_reference="false">int</type>
           </tag>
-          <tag line="86" name="return" description="" type="string">
+          <tag line="90" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
-        <argument line="95">
+        <argument line="99">
           <name>$sql</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="95">
+        <argument line="99">
           <name>$limit</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="95">
+        <argument line="99">
           <name>$offset</name>
           <default><![CDATA[FALSE]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="103" package="">
+      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="107" package="">
         <name>random</name>
         <type>function</type>
-        <docblock line="97">
+        <docblock line="101">
           <description><![CDATA[Get the sql for random ordering]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="97" name="abstract" description=""/>
-          <tag line="97" name="return" description="" type="string">
+          <tag line="101" name="abstract" description=""/>
+          <tag line="101" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="110" package="">
+      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="114" package="">
         <name>db_list</name>
         <type>function</type>
-        <docblock line="105">
+        <docblock line="109">
           <description><![CDATA[Returns sql to list other databases]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="105" name="return" description="" type="string">
+          <tag line="109" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="117" package="">
+      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="121" package="">
         <name>table_list</name>
         <type>function</type>
-        <docblock line="112">
+        <docblock line="116">
           <description><![CDATA[Returns sql to list tables]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="112" name="return" description="" type="string">
+          <tag line="116" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="124" package="">
+      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="128" package="">
         <name>system_table_list</name>
         <type>function</type>
-        <docblock line="119">
+        <docblock line="123">
           <description><![CDATA[Returns sql to list system tables]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="119" name="return" description="" type="string">
+          <tag line="123" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="131" package="">
+      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="135" package="">
         <name>view_list</name>
         <type>function</type>
-        <docblock line="126">
+        <docblock line="130">
           <description><![CDATA[Returns sql to list views]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="126" name="return" description="" type="string">
+          <tag line="130" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="138" package="">
+      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="142" package="">
         <name>trigger_list</name>
         <type>function</type>
-        <docblock line="133">
+        <docblock line="137">
           <description><![CDATA[Returns sql to list triggers]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="133" name="return" description="" type="string">
+          <tag line="137" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="145" package="">
+      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="149" package="">
         <name>function_list</name>
         <type>function</type>
-        <docblock line="140">
+        <docblock line="144">
           <description><![CDATA[Return sql to list functions]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="140" name="return" description="" type="FALSE">
+          <tag line="144" name="return" description="" type="FALSE">
             <type by_reference="false">FALSE</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="152" package="">
+      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="156" package="">
         <name>procedure_list</name>
         <type>function</type>
-        <docblock line="147">
+        <docblock line="151">
           <description><![CDATA[Return sql to list stored procedures]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="147" name="return" description="" type="string">
+          <tag line="151" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="159" package="">
+      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="163" package="">
         <name>sequence_list</name>
         <type>function</type>
-        <docblock line="154">
+        <docblock line="158">
           <description><![CDATA[Return sql to list sequences]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="154" name="return" description="" type="string">
+          <tag line="158" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
       </method>
     </class>
   </file>
-  <file path="sys/db/classes/db_pdo.php" hash="f8fb05f7bfffa3062ed7fa381028064d" package="Default">
+  <file path="sys/db/classes/db_pdo.php" hash="1bfc5cb0636e76db6f3802ff732d1ea2" package="Query">
     <docblock line="2">
       <description><![CDATA[Query]]></description>
       <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
+      <tag line="2" name="package" description="Query"/>
       <tag line="2" name="author" description="Timothy J. Warren"/>
       <tag line="2" name="copyright" description="Copyright (c) 2012"/>
       <tag line="2" name="link" description="https://github.com/aviat4ion/Query" link="https://github.com/aviat4ion/Query"/>
       <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
     </docblock>
-    <class final="false" abstract="true" namespace="default" line="20" package="Default">
+    <class final="false" abstract="true" namespace="default" line="24" package="Query\Query">
       <name>DB_PDO</name>
       <full_name>\DB_PDO</full_name>
       <extends>\PDO</extends>
-      <docblock line="15">
+      <docblock line="16">
         <description><![CDATA[Base Database class]]></description>
         <long-description><![CDATA[<p>Extends PDO to simplify cross-database issues</p>]]></long-description>
+        <tag line="16" name="package" description="Query"/>
+        <tag line="16" name="subpackage" description="Query"/>
       </docblock>
-      <property final="false" static="false" visibility="protected" line="25" package="Default">
+      <property final="false" static="false" visibility="protected" line="29" package="Default">
         <name>$statement</name>
         <default><![CDATA[]]></default>
-        <docblock line="22">
+        <docblock line="26">
           <description><![CDATA[Reference to the last executed query]]></description>
           <long-description><![CDATA[]]></long-description>
         </docblock>
       </property>
-      <property final="false" static="false" visibility="protected" line="30" package="Default">
+      <property final="false" static="false" visibility="protected" line="34" package="Default">
         <name>$escape_char</name>
         <default><![CDATA['"']]></default>
-        <docblock line="27">
+        <docblock line="31">
           <description><![CDATA[Character to escape identifiers]]></description>
           <long-description><![CDATA[]]></long-description>
         </docblock>
       </property>
-      <property final="false" static="false" visibility="public" line="35" package="Default">
+      <property final="false" static="false" visibility="public" line="39" package="Default">
         <name>$sql</name>
         <default><![CDATA[]]></default>
-        <docblock line="32">
+        <docblock line="36">
           <description><![CDATA[Reference to sql sub class]]></description>
           <long-description><![CDATA[]]></long-description>
         </docblock>
       </property>
-      <property final="false" static="false" visibility="public" line="40" package="Default">
+      <property final="false" static="false" visibility="public" line="44" package="Default">
         <name>$util</name>
         <default><![CDATA[]]></default>
-        <docblock line="37">
+        <docblock line="41">
           <description><![CDATA[Reference to util sub class]]></description>
           <long-description><![CDATA[]]></long-description>
         </docblock>
       </property>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="50" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="54" package="">
         <name>__construct</name>
         <type>function</type>
-        <docblock line="42">
+        <docblock line="46">
           <description><![CDATA[PDO constructor wrapper]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="42" name="param" description="" type="string" variable="$dsn">
+          <tag line="46" name="param" description="" type="string" variable="$dsn">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="42" name="param" description="" type="string" variable="$username">
+          <tag line="46" name="param" description="" type="string" variable="$username">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="42" name="param" description="" type="string" variable="$password">
+          <tag line="46" name="param" description="" type="string" variable="$password">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="42" name="param" description="" type="array" variable="$driver_options">
+          <tag line="46" name="param" description="" type="array" variable="$driver_options">
             <type by_reference="false">array</type>
           </tag>
         </docblock>
-        <argument line="50">
+        <argument line="54">
           <name>$dsn</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="50">
+        <argument line="54">
           <name>$username</name>
           <default><![CDATA[NULL]]></default>
           <type/>
         </argument>
-        <argument line="50">
+        <argument line="54">
           <name>$password</name>
           <default><![CDATA[NULL]]></default>
           <type/>
         </argument>
-        <argument line="50">
+        <argument line="54">
           <name>$driver_options</name>
           <default><![CDATA[array()]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="76" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="80" package="">
         <name>prepare_query</name>
         <type>function</type>
-        <docblock line="69">
+        <docblock line="73">
           <description><![CDATA[Simplifies prepared statements for database queries]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="69" name="param" description="" type="string" variable="$sql">
+          <tag line="73" name="param" description="" type="string" variable="$sql">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="69" name="param" description="" type="array" variable="$data">
+          <tag line="73" name="param" description="" type="array" variable="$data">
             <type by_reference="false">array</type>
           </tag>
-          <tag line="69" name="return" description="PDOStatement / FALSE" type="mixed">
+          <tag line="73" name="return" description="PDOStatement / FALSE" type="mixed">
             <type by_reference="false">mixed</type>
           </tag>
         </docblock>
-        <argument line="76">
+        <argument line="80">
           <name>$sql</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="76">
+        <argument line="80">
           <name>$data</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="127" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="131" package="">
         <name>prepare_execute</name>
         <type>function</type>
-        <docblock line="120">
+        <docblock line="124">
           <description><![CDATA[Create and execute a prepared statement with the provided parameters]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="120" name="param" description="" type="string" variable="$sql">
+          <tag line="124" name="param" description="" type="string" variable="$sql">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="120" name="param" description="" type="array" variable="$params">
+          <tag line="124" name="param" description="" type="array" variable="$params">
             <type by_reference="false">array</type>
           </tag>
-          <tag line="120" name="return" description="" type="\PDOStatement">
+          <tag line="124" name="return" description="" type="\PDOStatement">
             <type by_reference="false">\PDOStatement</type>
           </tag>
         </docblock>
-        <argument line="127">
+        <argument line="131">
           <name>$sql</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="127">
+        <argument line="131">
           <name>$params</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="143" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="147" package="">
         <name>get_query_data</name>
         <type>function</type>
-        <docblock line="137">
+        <docblock line="141">
           <description><![CDATA[Retreives the data from a select query]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="137" name="param" description="" type="\PDOStatement" variable="$statement">
+          <tag line="141" name="param" description="" type="\PDOStatement" variable="$statement">
             <type by_reference="false">\PDOStatement</type>
           </tag>
-          <tag line="137" name="return" description="" type="array">
+          <tag line="141" name="return" description="" type="array">
             <type by_reference="false">array</type>
           </tag>
         </docblock>
-        <argument line="143">
+        <argument line="147">
           <name>$statement</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="162" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="166" package="">
         <name>affected_rows</name>
         <type>function</type>
-        <docblock line="156">
+        <docblock line="160">
           <description><![CDATA[Returns number of rows affected by an INSERT, UPDATE, DELETE type query]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="156" name="param" description="" type="\PDOStatement" variable="$statement">
+          <tag line="160" name="param" description="" type="\PDOStatement" variable="$statement">
             <type by_reference="false">\PDOStatement</type>
           </tag>
-          <tag line="156" name="return" description="" type="int">
+          <tag line="160" name="return" description="" type="int">
             <type by_reference="false">int</type>
           </tag>
         </docblock>
-        <argument line="162">
+        <argument line="166">
           <name>$statement</name>
           <default><![CDATA['']]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="180" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="184" package="">
         <name>get_last_error</name>
         <type>function</type>
-        <docblock line="175">
+        <docblock line="179">
           <description><![CDATA[Return the last error for the current database connection]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="175" name="return" description="" type="string">
+          <tag line="179" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="195" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="199" package="">
         <name>quote_ident</name>
         <type>function</type>
-        <docblock line="189">
+        <docblock line="193">
           <description><![CDATA[Surrounds the string with the databases identifier escape characters]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="189" name="param" description="" type="mixed" variable="$ident">
+          <tag line="193" name="param" description="" type="mixed" variable="$ident">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="189" name="return" description="" type="string">
+          <tag line="193" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
-        <argument line="195">
+        <argument line="199">
           <name>$ident</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="219" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="223" package="">
         <name>empty_table</name>
         <type>function</type>
-        <docblock line="212">
+        <docblock line="216">
           <description><![CDATA[Deletes all the rows from a table. Does the same as the truncate
 method if the database does not support 'TRUNCATE';]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="212" name="param" description="" type="string" variable="$table">
+          <tag line="216" name="param" description="" type="string" variable="$table">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="212" name="return" description="" type="mixed">
+          <tag line="216" name="return" description="" type="mixed">
             <type by_reference="false">mixed</type>
           </tag>
         </docblock>
-        <argument line="219">
+        <argument line="223">
           <name>$table</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="233" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="237" package="">
         <name>get_schemas</name>
         <type>function</type>
-        <docblock line="228">
+        <docblock line="232">
           <description><![CDATA[Return schemas for databases that list them]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="228" name="return" description="" type="array">
+          <tag line="232" name="return" description="" type="array">
             <type by_reference="false">array</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="245" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="249" package="">
         <name>get_tables</name>
         <type>function</type>
-        <docblock line="240">
+        <docblock line="244">
           <description><![CDATA[Return list of tables for the current database]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="240" name="return" description="" type="array">
+          <tag line="244" name="return" description="" type="array">
             <type by_reference="false">array</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="257" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="261" package="">
         <name>get_dbs</name>
         <type>function</type>
-        <docblock line="252">
+        <docblock line="256">
           <description><![CDATA[Return list of dbs for the current connection, if possible]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="252" name="return" description="" type="array">
+          <tag line="256" name="return" description="" type="array">
             <type by_reference="false">array</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="269" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="273" package="">
         <name>get_views</name>
         <type>function</type>
-        <docblock line="264">
+        <docblock line="268">
           <description><![CDATA[Return list of views for the current database]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="264" name="return" description="" type="array">
+          <tag line="268" name="return" description="" type="array">
             <type by_reference="false">array</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="281" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="285" package="">
         <name>get_sequences</name>
         <type>function</type>
-        <docblock line="276">
+        <docblock line="280">
           <description><![CDATA[Return list of sequences for the current database, if they exist]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="276" name="return" description="" type="array">
+          <tag line="280" name="return" description="" type="array">
             <type by_reference="false">array</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="293" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="297" package="">
         <name>get_functions</name>
         <type>function</type>
-        <docblock line="288">
+        <docblock line="292">
           <description><![CDATA[Return list of function for the current database]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="288" name="return" description="" type="array">
+          <tag line="292" name="return" description="" type="array">
             <type by_reference="false">array</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="305" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="309" package="">
         <name>get_procedures</name>
         <type>function</type>
-        <docblock line="300">
+        <docblock line="304">
           <description><![CDATA[Return list of stored procedures for the current database]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="300" name="return" description="" type="array">
+          <tag line="304" name="return" description="" type="array">
             <type by_reference="false">array</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="317" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="321" package="">
         <name>get_triggers</name>
         <type>function</type>
-        <docblock line="312">
+        <docblock line="316">
           <description><![CDATA[Return list of triggers for the current database]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="312" name="return" description="" type="array">
+          <tag line="316" name="return" description="" type="array">
             <type by_reference="false">array</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="330" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="334" package="">
         <name>get_system_tables</name>
         <type>function</type>
-        <docblock line="324">
+        <docblock line="328">
           <description><![CDATA[Retreives an array of non-user-created tables for
 the connection/database]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="324" name="return" description="" type="array">
+          <tag line="328" name="return" description="" type="array">
             <type by_reference="false">array</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="protected" namespace="default" line="344" package="">
+      <method final="false" abstract="false" static="false" visibility="protected" namespace="default" line="348" package="">
         <name>driver_query</name>
         <type>function</type>
-        <docblock line="337">
+        <docblock line="341">
           <description><![CDATA[Method to simplify retreiving db results for meta-data queries]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="337" name="param" description="" type="string" variable="$sql">
+          <tag line="341" name="param" description="" type="string" variable="$sql">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="337" name="param" description="" type="bool" variable="$filtered_index">
+          <tag line="341" name="param" description="" type="bool" variable="$filtered_index">
             <type by_reference="false">bool</type>
           </tag>
-          <tag line="337" name="return" description="" type="mixed">
+          <tag line="341" name="return" description="" type="mixed">
             <type by_reference="false">mixed</type>
           </tag>
         </docblock>
-        <argument line="344">
+        <argument line="348">
           <name>$sql</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="344">
+        <argument line="348">
           <name>$filtered_index</name>
           <default><![CDATA[TRUE]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="370" package="">
+      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="374" package="">
         <name>truncate</name>
         <type>function</type>
-        <docblock line="363">
+        <docblock line="367">
           <description><![CDATA[Empty the passed table]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="363" name="param" description="" type="string" variable="$table">
+          <tag line="367" name="param" description="" type="string" variable="$table">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="363" name="return" description="" type="void">
+          <tag line="367" name="return" description="" type="void">
             <type by_reference="false">void</type>
           </tag>
         </docblock>
-        <argument line="370">
+        <argument line="374">
           <name>$table</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="377" package="">
+      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="381" package="">
         <name>num_rows</name>
         <type>function</type>
-        <docblock line="372">
+        <docblock line="376">
           <description><![CDATA[Return the number of rows for the last SELECT query]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="372" name="return" description="" type="int">
+          <tag line="376" name="return" description="" type="int">
             <type by_reference="false">int</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="385" package="">
+      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="389" package="">
         <name>switch_db</name>
         <type>function</type>
-        <docblock line="379">
+        <docblock line="383">
           <description><![CDATA[Connect to a different database]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="379" name="param" description="" type="string" variable="$name">
+          <tag line="383" name="param" description="" type="string" variable="$name">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="379" name="return" description="" type="void">
+          <tag line="383" name="return" description="" type="void">
             <type by_reference="false">void</type>
           </tag>
         </docblock>
-        <argument line="385">
+        <argument line="389">
           <name>$name</name>
           <default><![CDATA[]]></default>
           <type/>
@@ -911,7 +922,7 @@ the connection/database]]></description>
       </method>
     </class>
   </file>
-  <file path="sys/db/classes/query_builder.php" hash="d375a099b358b3df40da4afd58a5e279" package="Default">
+  <file path="sys/db/classes/query_builder.php" hash="30a3abbeeb55657ffc7531da59d4d9e8" package="Default">
     <docblock line="2">
       <description><![CDATA[Query]]></description>
       <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
@@ -920,7 +931,7 @@ the connection/database]]></description>
       <tag line="2" name="link" description="https://github.com/aviat4ion/Query" link="https://github.com/aviat4ion/Query"/>
       <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
     </docblock>
-    <class final="false" abstract="false" namespace="default" line="19" package="Default">
+    <class final="false" abstract="false" namespace="default" line="22" package="Query\Query">
       <name>Query_Builder</name>
       <full_name>\Query_Builder</full_name>
       <extends/>
@@ -928,115 +939,117 @@ the connection/database]]></description>
         <description><![CDATA[Convienience class for creating sql queries - also the class that
 instantiates the specific db driver]]></description>
         <long-description><![CDATA[]]></long-description>
+        <tag line="15" name="package" description="Query"/>
+        <tag line="15" name="subpackage" description="Query"/>
       </docblock>
-      <property final="false" static="false" visibility="private" line="24" package="Default">
+      <property final="false" static="false" visibility="private" line="27" package="Default">
         <name>$select_string</name>
         <default><![CDATA[]]></default>
-        <docblock line="21">
+        <docblock line="24">
           <description><![CDATA[Compiled 'select' clause]]></description>
           <long-description><![CDATA[]]></long-description>
         </docblock>
       </property>
-      <property final="false" static="false" visibility="private" line="29" package="Default">
+      <property final="false" static="false" visibility="private" line="32" package="Default">
         <name>$from_string</name>
         <default><![CDATA[]]></default>
-        <docblock line="26">
+        <docblock line="29">
           <description><![CDATA[Compiled 'from' clause]]></description>
           <long-description><![CDATA[]]></long-description>
         </docblock>
       </property>
-      <property final="false" static="false" visibility="private" line="34" package="Default">
+      <property final="false" static="false" visibility="private" line="37" package="Default">
         <name>$set_string</name>
         <default><![CDATA[]]></default>
-        <docblock line="31">
+        <docblock line="34">
           <description><![CDATA[Compiled arguments for insert / update]]></description>
           <long-description><![CDATA[]]></long-description>
         </docblock>
       </property>
-      <property final="false" static="false" visibility="private" line="39" package="Default">
+      <property final="false" static="false" visibility="private" line="42" package="Default">
         <name>$order_string</name>
         <default><![CDATA[]]></default>
-        <docblock line="36">
+        <docblock line="39">
           <description><![CDATA[Order by clause]]></description>
           <long-description><![CDATA[]]></long-description>
         </docblock>
       </property>
-      <property final="false" static="false" visibility="private" line="44" package="Default">
+      <property final="false" static="false" visibility="private" line="47" package="Default">
         <name>$group_string</name>
         <default><![CDATA[]]></default>
-        <docblock line="41">
+        <docblock line="44">
           <description><![CDATA[Group by clause]]></description>
           <long-description><![CDATA[]]></long-description>
         </docblock>
       </property>
-      <property final="false" static="false" visibility="private" line="51" package="Default">
+      <property final="false" static="false" visibility="private" line="54" package="Default">
         <name>$set_array</name>
         <default><![CDATA[]]></default>
-        <docblock line="48">
+        <docblock line="51">
           <description><![CDATA[key/val pairs for insert/update statement]]></description>
           <long-description><![CDATA[]]></long-description>
         </docblock>
       </property>
-      <property final="false" static="false" visibility="private" line="56" package="Default">
+      <property final="false" static="false" visibility="private" line="59" package="Default">
         <name>$set_array_keys</name>
         <default><![CDATA[]]></default>
-        <docblock line="53">
+        <docblock line="56">
           <description><![CDATA[Keys for insert/update statement]]></description>
           <long-description><![CDATA[]]></long-description>
         </docblock>
       </property>
-      <property final="false" static="false" visibility="private" line="61" package="Default">
+      <property final="false" static="false" visibility="private" line="64" package="Default">
         <name>$order_array</name>
         <default><![CDATA[]]></default>
-        <docblock line="58">
+        <docblock line="61">
           <description><![CDATA[Key/val pairs for order by clause]]></description>
           <long-description><![CDATA[]]></long-description>
         </docblock>
       </property>
-      <property final="false" static="false" visibility="private" line="66" package="Default">
+      <property final="false" static="false" visibility="private" line="69" package="Default">
         <name>$group_array</name>
         <default><![CDATA[]]></default>
-        <docblock line="63">
+        <docblock line="66">
           <description><![CDATA[Key/val pairs for group by clause]]></description>
           <long-description><![CDATA[]]></long-description>
         </docblock>
       </property>
-      <property final="false" static="false" visibility="private" line="73" package="Default">
+      <property final="false" static="false" visibility="private" line="76" package="Default">
         <name>$values</name>
         <default><![CDATA[]]></default>
-        <docblock line="70">
+        <docblock line="73">
           <description><![CDATA[Values to apply to prepared statements]]></description>
           <long-description><![CDATA[]]></long-description>
         </docblock>
       </property>
-      <property final="false" static="false" visibility="private" line="78" package="Default">
+      <property final="false" static="false" visibility="private" line="81" package="Default">
         <name>$limit</name>
         <default><![CDATA[]]></default>
-        <docblock line="75">
+        <docblock line="78">
           <description><![CDATA[Value for limit string]]></description>
           <long-description><![CDATA[]]></long-description>
         </docblock>
       </property>
-      <property final="false" static="false" visibility="private" line="83" package="Default">
+      <property final="false" static="false" visibility="private" line="86" package="Default">
         <name>$offset</name>
         <default><![CDATA[]]></default>
-        <docblock line="80">
+        <docblock line="83">
           <description><![CDATA[Value for offset in limit string]]></description>
           <long-description><![CDATA[]]></long-description>
         </docblock>
       </property>
-      <property final="false" static="false" visibility="private" line="88" package="Default">
+      <property final="false" static="false" visibility="private" line="91" package="Default">
         <name>$sql</name>
         <default><![CDATA[]]></default>
-        <docblock line="85">
+        <docblock line="88">
           <description><![CDATA[Alias to $this->db->sql]]></description>
           <long-description><![CDATA[]]></long-description>
         </docblock>
       </property>
-      <property final="false" static="false" visibility="private" line="102" package="Default">
+      <property final="false" static="false" visibility="private" line="105" package="Default">
         <name>$query_map</name>
         <default><![CDATA[]]></default>
-        <docblock line="90">
+        <docblock line="93">
           <description><![CDATA[Query component order mapping
 for complex select queries]]></description>
           <long-description><![CDATA[<p>Format:</p>
@@ -1048,1015 +1061,1015 @@ for complex select queries]]></description>
 )</p>]]></long-description>
         </docblock>
       </property>
-      <property final="false" static="false" visibility="private" line="107" package="Default">
+      <property final="false" static="false" visibility="private" line="110" package="Default">
         <name>$having_map</name>
         <default><![CDATA[]]></default>
-        <docblock line="104">
+        <docblock line="107">
           <description><![CDATA[Map for having clause]]></description>
           <long-description><![CDATA[]]></long-description>
         </docblock>
       </property>
-      <property final="false" static="false" visibility="public" line="112" package="Default">
+      <property final="false" static="false" visibility="public" line="115" package="Default">
         <name>$conn_name</name>
         <default><![CDATA[""]]></default>
-        <docblock line="109">
+        <docblock line="112">
           <description><![CDATA[Convenience property for connection management]]></description>
           <long-description><![CDATA[]]></long-description>
         </docblock>
       </property>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="123" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="126" package="">
         <name>__construct</name>
         <type>function</type>
-        <docblock line="118">
+        <docblock line="121">
           <description><![CDATA[Constructor]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="118" name="param" description="- the connection parametere" type="object" variable="$params">
+          <tag line="121" name="param" description="- the connection parametere" type="object" variable="$params">
             <type by_reference="false">object</type>
           </tag>
         </docblock>
-        <argument line="123">
+        <argument line="126">
           <name>$params</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="203" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="206" package="">
         <name>select</name>
         <type>function</type>
-        <docblock line="197">
+        <docblock line="200">
           <description><![CDATA[Specifies rows to select in a query]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="197" name="param" description="" type="string" variable="$fields">
+          <tag line="200" name="param" description="" type="string" variable="$fields">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="197" name="return" description="" type="\$this">
+          <tag line="200" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="203">
+        <argument line="206">
           <name>$fields</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="249" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="252" package="">
         <name>select_max</name>
         <type>function</type>
-        <docblock line="242">
+        <docblock line="245">
           <description><![CDATA[Selects the maximum value of a field from a query]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="242" name="param" description="" type="string" variable="$field">
+          <tag line="245" name="param" description="" type="string" variable="$field">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="242" name="param" description="" type="string" variable="$as">
+          <tag line="245" name="param" description="" type="string" variable="$as">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="242" name="return" description="" type="\$this">
+          <tag line="245" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="249">
+        <argument line="252">
           <name>$field</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="249">
+        <argument line="252">
           <name>$as</name>
           <default><![CDATA[FALSE]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="273" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="276" package="">
         <name>select_min</name>
         <type>function</type>
-        <docblock line="266">
+        <docblock line="269">
           <description><![CDATA[Selects the minimum value of a field from a query]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="266" name="param" description="" type="string" variable="$field">
+          <tag line="269" name="param" description="" type="string" variable="$field">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="266" name="param" description="" type="string" variable="$as">
+          <tag line="269" name="param" description="" type="string" variable="$as">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="266" name="return" description="" type="\$this">
+          <tag line="269" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="273">
+        <argument line="276">
           <name>$field</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="273">
+        <argument line="276">
           <name>$as</name>
           <default><![CDATA[FALSE]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="297" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="300" package="">
         <name>select_avg</name>
         <type>function</type>
-        <docblock line="290">
+        <docblock line="293">
           <description><![CDATA[Selects the average value of a field from a query]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="290" name="param" description="" type="string" variable="$field">
+          <tag line="293" name="param" description="" type="string" variable="$field">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="290" name="param" description="" type="string" variable="$as">
+          <tag line="293" name="param" description="" type="string" variable="$as">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="290" name="return" description="" type="\$this">
+          <tag line="293" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="297">
+        <argument line="300">
           <name>$field</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="297">
+        <argument line="300">
           <name>$as</name>
           <default><![CDATA[FALSE]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="321" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="324" package="">
         <name>select_sum</name>
         <type>function</type>
-        <docblock line="314">
+        <docblock line="317">
           <description><![CDATA[Selects the sum of a field from a query]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="314" name="param" description="" type="string" variable="$field">
+          <tag line="317" name="param" description="" type="string" variable="$field">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="314" name="param" description="" type="string" variable="$as">
+          <tag line="317" name="param" description="" type="string" variable="$as">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="314" name="return" description="" type="\$this">
+          <tag line="317" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="321">
+        <argument line="324">
           <name>$field</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="321">
+        <argument line="324">
           <name>$as</name>
           <default><![CDATA[FALSE]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="343" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="346" package="">
         <name>distinct</name>
         <type>function</type>
-        <docblock line="338">
+        <docblock line="341">
           <description><![CDATA[Adds the 'distinct' keyword to a query]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="338" name="return" description="" type="\$this">
+          <tag line="341" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="359" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="362" package="">
         <name>from</name>
         <type>function</type>
-        <docblock line="353">
+        <docblock line="356">
           <description><![CDATA[Specify the database table to select from]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="353" name="param" description="" type="string" variable="$dbname">
+          <tag line="356" name="param" description="" type="string" variable="$dbname">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="353" name="return" description="" type="\$this">
+          <tag line="356" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="359">
+        <argument line="362">
           <name>$dbname</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="386" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="389" package="">
         <name>like</name>
         <type>function</type>
-        <docblock line="378">
+        <docblock line="381">
           <description><![CDATA[Creates a Like clause in the sql statement]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="378" name="param" description="" type="string" variable="$field">
+          <tag line="381" name="param" description="" type="string" variable="$field">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="378" name="param" description="" type="mixed" variable="$val">
+          <tag line="381" name="param" description="" type="mixed" variable="$val">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="378" name="param" description="" type="string" variable="$pos">
+          <tag line="381" name="param" description="" type="string" variable="$pos">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="378" name="return" description="" type="\$this">
+          <tag line="381" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="386">
+        <argument line="389">
           <name>$field</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="386">
+        <argument line="389">
           <name>$val</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="386">
+        <argument line="389">
           <name>$pos</name>
           <default><![CDATA['both']]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="428" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="431" package="">
         <name>or_like</name>
         <type>function</type>
-        <docblock line="420">
+        <docblock line="423">
           <description><![CDATA[Generates an OR Like clause]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="420" name="param" description="" type="string" variable="$field">
+          <tag line="423" name="param" description="" type="string" variable="$field">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="420" name="param" description="" type="mixed" variable="$val">
+          <tag line="423" name="param" description="" type="mixed" variable="$val">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="420" name="param" description="" type="string" variable="$pos">
+          <tag line="423" name="param" description="" type="string" variable="$pos">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="420" name="return" description="" type="\$this">
+          <tag line="423" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="428">
+        <argument line="431">
           <name>$field</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="428">
+        <argument line="431">
           <name>$val</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="428">
+        <argument line="431">
           <name>$pos</name>
           <default><![CDATA['both']]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="470" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="473" package="">
         <name>not_like</name>
         <type>function</type>
-        <docblock line="462">
+        <docblock line="465">
           <description><![CDATA[Generates a NOT LIKE clause]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="462" name="param" description="" type="string" variable="$field">
+          <tag line="465" name="param" description="" type="string" variable="$field">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="462" name="param" description="" type="mixed" variable="$val">
+          <tag line="465" name="param" description="" type="mixed" variable="$val">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="462" name="param" description="" type="string" variable="$pos">
+          <tag line="465" name="param" description="" type="string" variable="$pos">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="462" name="return" description="" type="\$this">
+          <tag line="465" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="470">
+        <argument line="473">
           <name>$field</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="470">
+        <argument line="473">
           <name>$val</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="470">
+        <argument line="473">
           <name>$pos</name>
           <default><![CDATA['both']]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="512" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="515" package="">
         <name>or_not_like</name>
         <type>function</type>
-        <docblock line="504">
+        <docblock line="507">
           <description><![CDATA[Generates a OR NOT LIKE clause]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="504" name="param" description="" type="string" variable="$field">
+          <tag line="507" name="param" description="" type="string" variable="$field">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="504" name="param" description="" type="mixed" variable="$val">
+          <tag line="507" name="param" description="" type="mixed" variable="$val">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="504" name="param" description="" type="string" variable="$pos">
+          <tag line="507" name="param" description="" type="string" variable="$pos">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="504" name="return" description="" type="\$this;">
-            <type by_reference="false">\$this;</type>
+          <tag line="507" name="return" description="" type="\$this">
+            <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="512">
+        <argument line="515">
           <name>$field</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="512">
+        <argument line="515">
           <name>$val</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="512">
+        <argument line="515">
           <name>$pos</name>
           <default><![CDATA['both']]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="553" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="556" package="">
         <name>having</name>
         <type>function</type>
-        <docblock line="546">
+        <docblock line="549">
           <description><![CDATA[Generates a 'Having' clause]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="546" name="param" description="" type="mixed" variable="$key">
+          <tag line="549" name="param" description="" type="mixed" variable="$key">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="546" name="param" description="" type="mixed" variable="$val">
+          <tag line="549" name="param" description="" type="mixed" variable="$val">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="546" name="return" description="" type="\$this">
+          <tag line="549" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="553">
+        <argument line="556">
           <name>$key</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="553">
+        <argument line="556">
           <name>$val</name>
           <default><![CDATA[array()]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="588" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="591" package="">
         <name>or_having</name>
         <type>function</type>
-        <docblock line="581">
+        <docblock line="584">
           <description><![CDATA[Generates a 'Having' clause prefixed with 'OR']]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="581" name="param" description="" type="mixed" variable="$key">
+          <tag line="584" name="param" description="" type="mixed" variable="$key">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="581" name="param" description="" type="mixed" variable="$val">
+          <tag line="584" name="param" description="" type="mixed" variable="$val">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="581" name="return" description="" type="\$this">
+          <tag line="584" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="588">
+        <argument line="591">
           <name>$key</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="588">
+        <argument line="591">
           <name>$val</name>
           <default><![CDATA[array()]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="625" package="">
+      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="628" package="">
         <name>_where</name>
         <type>function</type>
-        <docblock line="618">
+        <docblock line="621">
           <description><![CDATA[Do all the repeditive stuff for where/having type methods]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="618" name="param" description="" type="mixed" variable="$key">
+          <tag line="621" name="param" description="" type="mixed" variable="$key">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="618" name="param" description="" type="mixed" variable="$val">
+          <tag line="621" name="param" description="" type="mixed" variable="$val">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="618" name="return" description="" type="array">
+          <tag line="621" name="return" description="" type="array">
             <type by_reference="false">array</type>
           </tag>
         </docblock>
-        <argument line="625">
+        <argument line="628">
           <name>$key</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="625">
+        <argument line="628">
           <name>$val</name>
           <default><![CDATA[array()]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="659" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="662" package="">
         <name>where</name>
         <type>function</type>
-        <docblock line="650">
+        <docblock line="653">
           <description><![CDATA[Specify condition(s) in the where clause of a query
 Note: this function works with key / value, or a
 passed array with key / value pairs]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="650" name="param" description="" type="mixed" variable="$key">
+          <tag line="653" name="param" description="" type="mixed" variable="$key">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="650" name="param" description="" type="mixed" variable="$val">
+          <tag line="653" name="param" description="" type="mixed" variable="$val">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="650" name="return" description="" type="\$this">
+          <tag line="653" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="659">
+        <argument line="662">
           <name>$key</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="659">
+        <argument line="662">
           <name>$val</name>
           <default><![CDATA[array()]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="695" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="698" package="">
         <name>or_where</name>
         <type>function</type>
-        <docblock line="688">
+        <docblock line="691">
           <description><![CDATA[Where clause prefixed with "OR"]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="688" name="param" description="" type="string" variable="$field">
+          <tag line="691" name="param" description="" type="string" variable="$field">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="688" name="param" description="" type="mixed" variable="$val">
+          <tag line="691" name="param" description="" type="mixed" variable="$val">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="688" name="return" description="" type="\$this">
+          <tag line="691" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="695">
+        <argument line="698">
           <name>$field</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="695">
+        <argument line="698">
           <name>$val</name>
           <default><![CDATA[array()]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="736" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="739" package="">
         <name>where_in</name>
         <type>function</type>
-        <docblock line="729">
+        <docblock line="732">
           <description><![CDATA[Where clause with 'IN' statement]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="729" name="param" description="" type="mixed" variable="$field">
+          <tag line="732" name="param" description="" type="mixed" variable="$field">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="729" name="param" description="" type="mixed" variable="$val">
+          <tag line="732" name="param" description="" type="mixed" variable="$val">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="729" name="return" description="" type="\$this">
+          <tag line="732" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="736">
+        <argument line="739">
           <name>$field</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="736">
+        <argument line="739">
           <name>$val</name>
           <default><![CDATA[array()]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="766" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="769" package="">
         <name>or_where_in</name>
         <type>function</type>
-        <docblock line="759">
+        <docblock line="762">
           <description><![CDATA[Where in statement prefixed with "or"]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="759" name="param" description="" type="string" variable="$field">
+          <tag line="762" name="param" description="" type="string" variable="$field">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="759" name="param" description="" type="mixed" variable="$val">
+          <tag line="762" name="param" description="" type="mixed" variable="$val">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="759" name="return" description="" type="\$this">
+          <tag line="762" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="766">
+        <argument line="769">
           <name>$field</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="766">
+        <argument line="769">
           <name>$val</name>
           <default><![CDATA[array()]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="796" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="799" package="">
         <name>where_not_in</name>
         <type>function</type>
-        <docblock line="789">
+        <docblock line="792">
           <description><![CDATA[WHERE NOT IN (FOO) clause]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="789" name="param" description="" type="string" variable="$field">
+          <tag line="792" name="param" description="" type="string" variable="$field">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="789" name="param" description="" type="mixed" variable="$val">
+          <tag line="792" name="param" description="" type="mixed" variable="$val">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="789" name="return" description="" type="\$this">
+          <tag line="792" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="796">
+        <argument line="799">
           <name>$field</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="796">
+        <argument line="799">
           <name>$val</name>
           <default><![CDATA[array()]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="826" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="829" package="">
         <name>or_where_not_in</name>
         <type>function</type>
-        <docblock line="819">
+        <docblock line="822">
           <description><![CDATA[OR WHERE NOT IN (FOO) clause]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="819" name="param" description="" type="string" variable="$field">
+          <tag line="822" name="param" description="" type="string" variable="$field">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="819" name="param" description="" type="mixed" variable="$val">
+          <tag line="822" name="param" description="" type="mixed" variable="$val">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="819" name="return" description="" type="\$this">
+          <tag line="822" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="826">
+        <argument line="829">
           <name>$field</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="826">
+        <argument line="829">
           <name>$val</name>
           <default><![CDATA[array()]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="858" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="861" package="">
         <name>set</name>
         <type>function</type>
-        <docblock line="851">
+        <docblock line="854">
           <description><![CDATA[Sets values for inserts / updates / deletes]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="851" name="param" description="" type="mixed" variable="$key">
+          <tag line="854" name="param" description="" type="mixed" variable="$key">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="851" name="param" description="" type="mixed" variable="$val">
+          <tag line="854" name="param" description="" type="mixed" variable="$val">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="851" name="return" description="" type="\$this">
+          <tag line="854" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="858">
+        <argument line="861">
           <name>$key</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="858">
+        <argument line="861">
           <name>$val</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="897" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="900" package="">
         <name>join</name>
         <type>function</type>
-        <docblock line="889">
+        <docblock line="892">
           <description><![CDATA[Creates a join phrase in a compiled query]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="889" name="param" description="" type="string" variable="$table">
+          <tag line="892" name="param" description="" type="string" variable="$table">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="889" name="param" description="" type="string" variable="$condition">
+          <tag line="892" name="param" description="" type="string" variable="$condition">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="889" name="param" description="" type="string" variable="$type">
+          <tag line="892" name="param" description="" type="string" variable="$type">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="889" name="return" description="" type="\$this">
+          <tag line="892" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="897">
+        <argument line="900">
           <name>$table</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="897">
+        <argument line="900">
           <name>$condition</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="897">
+        <argument line="900">
           <name>$type</name>
           <default><![CDATA['']]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="925" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="928" package="">
         <name>group_by</name>
         <type>function</type>
-        <docblock line="919">
+        <docblock line="922">
           <description><![CDATA[Group the results by the selected field(s)]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="919" name="param" description="" type="mixed" variable="$field">
+          <tag line="922" name="param" description="" type="mixed" variable="$field">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="919" name="return" description="" type="\$this">
+          <tag line="922" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="925">
+        <argument line="928">
           <name>$field</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="950" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="953" package="">
         <name>order_by</name>
         <type>function</type>
-        <docblock line="943">
+        <docblock line="946">
           <description><![CDATA[Order the results by the selected field(s)]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="943" name="param" description="" type="string" variable="$field">
+          <tag line="946" name="param" description="" type="string" variable="$field">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="943" name="param" description="" type="string" variable="$type">
+          <tag line="946" name="param" description="" type="string" variable="$type">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="943" name="return" description="" type="\$this">
+          <tag line="946" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="950">
+        <argument line="953">
           <name>$field</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="950">
+        <argument line="953">
           <name>$type</name>
           <default><![CDATA[""]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="987" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="990" package="">
         <name>limit</name>
         <type>function</type>
-        <docblock line="980">
+        <docblock line="983">
           <description><![CDATA[Set a limit on the current sql statement]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="980" name="param" description="" type="int" variable="$limit">
+          <tag line="983" name="param" description="" type="int" variable="$limit">
             <type by_reference="false">int</type>
           </tag>
-          <tag line="980" name="param" description="" type="int" variable="$offset">
+          <tag line="983" name="param" description="" type="int" variable="$offset">
             <type by_reference="false">int</type>
           </tag>
-          <tag line="980" name="return" description="" type="string">
+          <tag line="983" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
-        <argument line="987">
+        <argument line="990">
           <name>$limit</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="987">
+        <argument line="990">
           <name>$offset</name>
           <default><![CDATA[FALSE]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1004" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1007" package="">
         <name>group_start</name>
         <type>function</type>
-        <docblock line="999">
+        <docblock line="1002">
           <description><![CDATA[Adds a paren to the current query for query grouping]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="999" name="return" description="" type="\$this">
+          <tag line="1002" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1023" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1026" package="">
         <name>or_group_start</name>
         <type>function</type>
-        <docblock line="1017">
+        <docblock line="1020">
           <description><![CDATA[Adds a paren to the current query for query grouping,
 prefixed with 'OR']]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="1017" name="return" description="" type="\$this">
+          <tag line="1020" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1042" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1045" package="">
         <name>or_not_group_start</name>
         <type>function</type>
-        <docblock line="1036">
+        <docblock line="1039">
           <description><![CDATA[Adds a paren to the current query for query grouping,
 prefixed with 'OR NOT']]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="1036" name="return" description="" type="\$this">
+          <tag line="1039" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1060" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1063" package="">
         <name>group_end</name>
         <type>function</type>
-        <docblock line="1055">
+        <docblock line="1058">
           <description><![CDATA[Ends a query group]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="1055" name="return" description="" type="\$this">
+          <tag line="1058" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1084" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1087" package="">
         <name>get</name>
         <type>function</type>
-        <docblock line="1075">
+        <docblock line="1078">
           <description><![CDATA[Select and retrieve all records from the current table, and/or
 execute current compiled query]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="1075" name="param" description="" type="" variable="$table"/>
-          <tag line="1075" name="param" description="" type="int" variable="$limit">
+          <tag line="1078" name="param" description="" type="" variable="$table"/>
+          <tag line="1078" name="param" description="" type="int" variable="$limit">
             <type by_reference="false">int</type>
           </tag>
-          <tag line="1075" name="param" description="" type="int" variable="$offset">
+          <tag line="1078" name="param" description="" type="int" variable="$offset">
             <type by_reference="false">int</type>
           </tag>
-          <tag line="1075" name="return" description="" type="object">
+          <tag line="1078" name="return" description="" type="object">
             <type by_reference="false">object</type>
           </tag>
         </docblock>
-        <argument line="1084">
+        <argument line="1087">
           <name>$table</name>
           <default><![CDATA['']]></default>
           <type/>
         </argument>
-        <argument line="1084">
+        <argument line="1087">
           <name>$limit</name>
           <default><![CDATA[FALSE]]></default>
           <type/>
         </argument>
-        <argument line="1084">
+        <argument line="1087">
           <name>$offset</name>
           <default><![CDATA[FALSE]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1128" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1131" package="">
         <name>get_where</name>
         <type>function</type>
-        <docblock line="1119">
+        <docblock line="1122">
           <description><![CDATA[Convience method for get() with a where clause]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="1119" name="param" description="" type="string" variable="$table">
+          <tag line="1122" name="param" description="" type="string" variable="$table">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="1119" name="param" description="" type="array" variable="$where">
+          <tag line="1122" name="param" description="" type="array" variable="$where">
             <type by_reference="false">array</type>
           </tag>
-          <tag line="1119" name="param" description="" type="int" variable="$limit">
+          <tag line="1122" name="param" description="" type="int" variable="$limit">
             <type by_reference="false">int</type>
           </tag>
-          <tag line="1119" name="param" description="" type="int" variable="$offset">
+          <tag line="1122" name="param" description="" type="int" variable="$offset">
             <type by_reference="false">int</type>
           </tag>
-          <tag line="1119" name="return" description="" type="object">
+          <tag line="1122" name="return" description="" type="object">
             <type by_reference="false">object</type>
           </tag>
         </docblock>
-        <argument line="1128">
+        <argument line="1131">
           <name>$table</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="1128">
+        <argument line="1131">
           <name>$where</name>
           <default><![CDATA[array()]]></default>
           <type/>
         </argument>
-        <argument line="1128">
+        <argument line="1131">
           <name>$limit</name>
           <default><![CDATA[FALSE]]></default>
           <type/>
         </argument>
-        <argument line="1128">
+        <argument line="1131">
           <name>$offset</name>
           <default><![CDATA[FALSE]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1145" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1148" package="">
         <name>count_all</name>
         <type>function</type>
-        <docblock line="1139">
+        <docblock line="1142">
           <description><![CDATA[Retreive the number of rows in the selected table]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="1139" name="param" description="" type="string" variable="$table">
+          <tag line="1142" name="param" description="" type="string" variable="$table">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="1139" name="return" description="" type="int">
+          <tag line="1142" name="return" description="" type="int">
             <type by_reference="false">int</type>
           </tag>
         </docblock>
-        <argument line="1145">
+        <argument line="1148">
           <name>$table</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1161" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1164" package="">
         <name>count_all_results</name>
         <type>function</type>
-        <docblock line="1154">
+        <docblock line="1157">
           <description><![CDATA[Retrieve the number of results for the generated query - used
 in place of the get() method]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="1154" name="param" description="" type="string" variable="$table">
+          <tag line="1157" name="param" description="" type="string" variable="$table">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="1154" name="return" description="" type="int">
+          <tag line="1157" name="return" description="" type="int">
             <type by_reference="false">int</type>
           </tag>
         </docblock>
-        <argument line="1161">
+        <argument line="1164">
           <name>$table</name>
           <default><![CDATA['']]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1199" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1202" package="">
         <name>insert</name>
         <type>function</type>
-        <docblock line="1192">
+        <docblock line="1195">
           <description><![CDATA[Creates an insert clause, and executes it]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="1192" name="param" description="" type="string" variable="$table">
+          <tag line="1195" name="param" description="" type="string" variable="$table">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="1192" name="param" description="" type="mixed" variable="$data">
+          <tag line="1195" name="param" description="" type="mixed" variable="$data">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="1192" name="return" description="" type="mixed">
+          <tag line="1195" name="return" description="" type="mixed">
             <type by_reference="false">mixed</type>
           </tag>
         </docblock>
-        <argument line="1199">
+        <argument line="1202">
           <name>$table</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="1199">
+        <argument line="1202">
           <name>$data</name>
           <default><![CDATA[array()]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1225" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1228" package="">
         <name>update</name>
         <type>function</type>
-        <docblock line="1218">
+        <docblock line="1221">
           <description><![CDATA[Creates an update clause, and executes it]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="1218" name="param" description="" type="string" variable="$table">
+          <tag line="1221" name="param" description="" type="string" variable="$table">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="1218" name="param" description="" type="mixed" variable="$data">
+          <tag line="1221" name="param" description="" type="mixed" variable="$data">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="1218" name="return" description="" type="mixed">
+          <tag line="1221" name="return" description="" type="mixed">
             <type by_reference="false">mixed</type>
           </tag>
         </docblock>
-        <argument line="1225">
+        <argument line="1228">
           <name>$table</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="1225">
+        <argument line="1228">
           <name>$data</name>
           <default><![CDATA[array()]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1252" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1255" package="">
         <name>delete</name>
         <type>function</type>
-        <docblock line="1245">
+        <docblock line="1248">
           <description><![CDATA[Deletes data from a table]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="1245" name="param" description="" type="string" variable="$table">
+          <tag line="1248" name="param" description="" type="string" variable="$table">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="1245" name="param" description="" type="mixed" variable="$where">
+          <tag line="1248" name="param" description="" type="mixed" variable="$where">
             <type by_reference="false">mixed</type>
           </tag>
-          <tag line="1245" name="return" description="" type="mixed">
+          <tag line="1248" name="return" description="" type="mixed">
             <type by_reference="false">mixed</type>
           </tag>
         </docblock>
-        <argument line="1252">
+        <argument line="1255">
           <name>$table</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="1252">
+        <argument line="1255">
           <name>$where</name>
           <default><![CDATA['']]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1283" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="1286" package="">
         <name>__call</name>
         <type>function</type>
-        <docblock line="1276">
+        <docblock line="1279">
           <description><![CDATA[Calls a function further down the inheritence chain]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="1276" name="param" description="" type="string" variable="$name">
+          <tag line="1279" name="param" description="" type="string" variable="$name">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="1276" name="param" description="" type="array" variable="$params">
+          <tag line="1279" name="param" description="" type="array" variable="$params">
             <type by_reference="false">array</type>
           </tag>
-          <tag line="1276" name="return" description="" type="mixed">
+          <tag line="1279" name="return" description="" type="mixed">
             <type by_reference="false">mixed</type>
           </tag>
         </docblock>
-        <argument line="1283">
+        <argument line="1286">
           <name>$name</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="1283">
+        <argument line="1286">
           <name>$params</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="1298" package="">
+      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="1301" package="">
         <name>_reset</name>
         <type>function</type>
-        <docblock line="1295">
+        <docblock line="1298">
           <description><![CDATA[Clear out the class variables, so the next query can be run]]></description>
           <long-description><![CDATA[]]></long-description>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="1340" package="">
+      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="1343" package="">
         <name>_compile</name>
         <type>function</type>
-        <docblock line="1333">
+        <docblock line="1336">
           <description><![CDATA[String together the sql statements for sending to the db]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="1333" name="param" description="" type="string" variable="$type">
+          <tag line="1336" name="param" description="" type="string" variable="$type">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="1333" name="param" description="" type="string" variable="$table">
+          <tag line="1336" name="param" description="" type="string" variable="$table">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="1333" name="return" description="" type="\$string">
+          <tag line="1336" name="return" description="" type="\$string">
             <type by_reference="false">\$string</type>
           </tag>
         </docblock>
-        <argument line="1340">
+        <argument line="1343">
           <name>$type</name>
           <default><![CDATA['']]></default>
           <type/>
         </argument>
-        <argument line="1340">
+        <argument line="1343">
           <name>$table</name>
           <default><![CDATA[""]]></default>
           <type/>
@@ -2064,1631 +2077,1119 @@ in place of the get() method]]></description>
       </method>
     </class>
   </file>
-  <file path="sys/db/classes/db_util.php" hash="431de8d317520e41982bb00140d9bc11" package="Default">
+  <file path="sys/db/classes/db_util.php" hash="1a56d6f40af0e6860d9ae0dbcde8451c" package="Query">
     <docblock line="2">
       <description><![CDATA[Query]]></description>
       <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
+      <tag line="2" name="package" description="Query"/>
       <tag line="2" name="author" description="Timothy J. Warren"/>
       <tag line="2" name="copyright" description="Copyright (c) 2012"/>
       <tag line="2" name="link" description="https://github.com/aviat4ion/Query" link="https://github.com/aviat4ion/Query"/>
       <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
     </docblock>
-    <class final="false" abstract="true" namespace="default" line="18" package="Default">
+    <class final="false" abstract="true" namespace="default" line="22" package="Query\Query">
       <name>DB_Util</name>
       <full_name>\DB_Util</full_name>
       <extends/>
-      <docblock line="15">
+      <docblock line="16">
         <description><![CDATA[Abstract class defining database / table creation methods]]></description>
         <long-description><![CDATA[]]></long-description>
+        <tag line="16" name="package" description="Query"/>
+        <tag line="16" name="subpackage" description="Query"/>
       </docblock>
-      <property final="false" static="false" visibility="private" line="23" package="Default">
+      <property final="false" static="false" visibility="private" line="27" package="Default">
         <name>$conn</name>
         <default><![CDATA[]]></default>
-        <docblock line="20">
-          <description><![CDATA[Reference to the current connection object]]></description>
-          <long-description><![CDATA[]]></long-description>
-        </docblock>
-      </property>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="30" package="">
-        <name>__construct</name>
-        <type>function</type>
-        <docblock line="25">
-          <description><![CDATA[Save a reference to the connection object for later use]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="25" name="param" description="&amp;$conn" type="object" variable="$conn">
-            <type by_reference="false">object</type>
-          </tag>
-        </docblock>
-        <argument line="30">
-          <name>$conn</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="43" package="">
-        <name>__call</name>
-        <type>function</type>
-        <docblock line="37">
-          <description><![CDATA[Enable calling driver methods]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="37" name="param" description="" type="string" variable="$method">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="37" name="param" description="" type="array" variable="$args">
-            <type by_reference="false">array</type>
-          </tag>
-        </docblock>
-        <argument line="43">
-          <name>$method</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-        <argument line="43">
-          <name>$args</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="67" package="">
-        <name>create_table</name>
-        <type>function</type>
-        <docblock line="57">
-          <description><![CDATA[Get database-specific sql to create a new table]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="57" name="abstract" description=""/>
-          <tag line="57" name="param" description="" type="string" variable="$name">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="57" name="param" description="" type="array" variable="$columns">
-            <type by_reference="false">array</type>
-          </tag>
-          <tag line="57" name="param" description="" type="array" variable="$constraints">
-            <type by_reference="false">array</type>
-          </tag>
-          <tag line="57" name="param" description="" type="array" variable="$indexes">
-            <type by_reference="false">array</type>
-          </tag>
-          <tag line="57" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-        <argument line="67">
-          <name>$name</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-        <argument line="67">
-          <name>$columns</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-        <argument line="67">
-          <name>$constraints</name>
-          <default><![CDATA[array()]]></default>
-          <type>array</type>
-        </argument>
-        <argument line="67">
-          <name>$indexes</name>
-          <default><![CDATA[array()]]></default>
-          <type>array</type>
-        </argument>
-      </method>
-      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="76" package="">
-        <name>delete_table</name>
-        <type>function</type>
-        <docblock line="69">
-          <description><![CDATA[Get database-specific sql to drop a table]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="69" name="abstract" description=""/>
-          <tag line="69" name="param" description="" type="string" variable="$name">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="69" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-        <argument line="76">
-          <name>$name</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="84" package="">
-        <name>backup_structure</name>
-        <type>function</type>
-        <docblock line="78">
-          <description><![CDATA[Return an SQL file with the database table structure]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="78" name="abstract" description=""/>
-          <tag line="78" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="92" package="">
-        <name>backup_data</name>
-        <type>function</type>
-        <docblock line="86">
-          <description><![CDATA[Return an SQL file with the database data as insert statements]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="86" name="abstract" description=""/>
-          <tag line="86" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-      </method>
-    </class>
-  </file>
-  <file path="sys/db/autoload.php" hash="921f7582dd35a5ba96d22c7e75c2b3e4" package="Default">
-    <docblock line="2">
-      <description><![CDATA[Query]]></description>
-      <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
-      <tag line="2" name="author" description="Timothy J. Warren"/>
-      <tag line="2" name="copyright" description="Copyright (c) 2012"/>
-      <tag line="2" name="link" description="https://github.com/aviat4ion/Query" link="https://github.com/aviat4ion/Query"/>
-      <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
-    </docblock>
-    <constant namespace="default" line="22" package="Default">
-      <name>BASE_PATH</name>
-      <value><![CDATA[dirname(__FILE__).'/']]></value>
-      <docblock line="19">
-        <description><![CDATA[Reference to root path]]></description>
-        <long-description><![CDATA[]]></long-description>
-      </docblock>
-    </constant>
-    <constant namespace="default" line="27" package="Default">
-      <name>DRIVER_PATH</name>
-      <value><![CDATA[BASE_PATH.'drivers/']]></value>
-      <docblock line="24">
-        <description><![CDATA[Path to driver classes]]></description>
-        <long-description><![CDATA[]]></long-description>
-      </docblock>
-    </constant>
-    <function namespace="default" line="38" package="Default">
-      <name>do_include</name>
-      <type>function</type>
-      <docblock line="31">
-        <description><![CDATA[Bulk directory loading workaround for use
-with array_map and glob]]></description>
-        <long-description><![CDATA[]]></long-description>
-        <tag line="31" name="param" description="" type="string" variable="$path">
-          <type by_reference="false">string</type>
-        </tag>
-        <tag line="31" name="return" description="" type="void">
-          <type by_reference="false">void</type>
-        </tag>
-      </docblock>
-      <argument line="38">
-        <name>$path</name>
-        <default><![CDATA[]]></default>
-        <type/>
-      </argument>
-    </function>
-    <function namespace="default" line="73" package="Default">
-      <name>db_filter</name>
-      <type>function</type>
-      <docblock line="66">
-        <description><![CDATA[Filter out db rows into one array]]></description>
-        <long-description><![CDATA[]]></long-description>
-        <tag line="66" name="param" description="" type="array" variable="$array">
-          <type by_reference="false">array</type>
-        </tag>
-        <tag line="66" name="param" description="" type="mixed" variable="$index">
-          <type by_reference="false">mixed</type>
-        </tag>
-        <tag line="66" name="return" description="" type="array">
-          <type by_reference="false">array</type>
-        </tag>
-      </docblock>
-      <argument line="73">
-        <name>$array</name>
-        <default><![CDATA[]]></default>
-        <type/>
-      </argument>
-      <argument line="73">
-        <name>$index</name>
-        <default><![CDATA[]]></default>
-        <type/>
-      </argument>
-    </function>
-  </file>
-  <file path="sys/db/drivers/pgsql/pgsql_sql.php" hash="6e96291ff159ec7586563edb0321e779" package="Default">
-    <docblock line="2">
-      <description><![CDATA[Query]]></description>
-      <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
-      <tag line="2" name="author" description="Timothy J. Warren"/>
-      <tag line="2" name="copyright" description="Copyright (c) 2012"/>
-      <tag line="2" name="link" description="https://github.com/aviat4ion/Query" link="https://github.com/aviat4ion/Query"/>
-      <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
-    </docblock>
-    <class final="false" abstract="false" namespace="default" line="18" package="Default">
-      <name>pgSQL_SQL</name>
-      <full_name>\pgSQL_SQL</full_name>
-      <extends>\DB_SQL</extends>
-      <docblock line="15">
-        <description><![CDATA[PostgreSQL specifc SQL]]></description>
-        <long-description><![CDATA[]]></long-description>
-      </docblock>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="28" package="">
-        <name>limit</name>
-        <type>function</type>
-        <docblock line="20">
-          <description><![CDATA[Limit clause]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="20" name="param" description="" type="string" variable="$sql">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="20" name="param" description="" type="int" variable="$limit">
-            <type by_reference="false">int</type>
-          </tag>
-          <tag line="20" name="param" description="" type="int" variable="$offset">
-            <type by_reference="false">int</type>
-          </tag>
-          <tag line="20" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-        <argument line="28">
-          <name>$sql</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-        <argument line="28">
-          <name>$limit</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-        <argument line="28">
-          <name>$offset</name>
-          <default><![CDATA[FALSE]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="47" package="">
-        <name>random</name>
-        <type>function</type>
-        <docblock line="42">
-          <description><![CDATA[Random ordering keyword]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="42" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="59" package="">
-        <name>db_list</name>
-        <type>function</type>
-        <docblock line="54">
-          <description><![CDATA[Returns sql to list other databases]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="54" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="75" package="">
-        <name>table_list</name>
-        <type>function</type>
-        <docblock line="70">
-          <description><![CDATA[Returns sql to list tables]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="70" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="93" package="">
-        <name>system_table_list</name>
-        <type>function</type>
-        <docblock line="88">
-          <description><![CDATA[Returns sql to list system tables]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="88" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="111" package="">
-        <name>view_list</name>
-        <type>function</type>
-        <docblock line="106">
-          <description><![CDATA[Returns sql to list views]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="106" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="129" package="">
-        <name>trigger_list</name>
-        <type>function</type>
-        <docblock line="124">
-          <description><![CDATA[Returns sql to list triggers]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="124" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="146" package="">
-        <name>function_list</name>
-        <type>function</type>
-        <docblock line="141">
-          <description><![CDATA[Return sql to list functions]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="141" name="return" description="" type="FALSE">
-            <type by_reference="false">FALSE</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="158" package="">
-        <name>procedure_list</name>
-        <type>function</type>
-        <docblock line="153">
-          <description><![CDATA[Return sql to list stored procedures]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="153" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="176" package="">
-        <name>sequence_list</name>
-        <type>function</type>
-        <docblock line="171">
-          <description><![CDATA[Return sql to list sequences]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="171" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="194" package="">
-        <name>column_list</name>
-        <type>function</type>
-        <docblock line="188">
-          <description><![CDATA[Return sql to list columns of the specified table]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="188" name="param" description="" type="string" variable="$table">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="188" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-        <argument line="194">
-          <name>$table</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-      </method>
-    </class>
-  </file>
-  <file path="sys/db/drivers/pgsql/pgsql_util.php" hash="e4363e06307d5e7281dbdbf76e7f5a93" package="Default">
-    <docblock line="2">
-      <description><![CDATA[Query]]></description>
-      <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
-      <tag line="2" name="author" description="Timothy J. Warren"/>
-      <tag line="2" name="copyright" description="Copyright (c) 2012"/>
-      <tag line="2" name="link" description="https://github.com/aviat4ion/Query" link="https://github.com/aviat4ion/Query"/>
-      <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
-    </docblock>
-    <class final="false" abstract="false" namespace="default" line="18" package="Default">
-      <name>PgSQL_Util</name>
-      <full_name>\PgSQL_Util</full_name>
-      <extends>\DB_Util</extends>
-      <docblock line="15">
-        <description><![CDATA[Posgres-specific backup, import and creation methods]]></description>
-        <long-description><![CDATA[]]></long-description>
-      </docblock>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="26" package="">
-        <name>__construct</name>
-        <type>function</type>
-        <docblock line="20">
-          <description><![CDATA[Save a reference to the current connection object]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="20" name="param" description="&amp;$conn" type="object" variable="$conn">
-            <type by_reference="false">object</type>
-          </tag>
-          <tag line="20" name="return" description="" type="void">
-            <type by_reference="false">void</type>
-          </tag>
-        </docblock>
-        <argument line="26">
-          <name>$conn</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="40" package="">
-        <name>create_table</name>
-        <type>function</type>
-        <docblock line="31">
-          <description><![CDATA[Database-specific method to create a new table]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="31" name="param" description="" type="string" variable="$name">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="31" name="param" description="" type="array" variable="$columns">
-            <type by_reference="false">array</type>
-          </tag>
-          <tag line="31" name="param" description="" type="array" variable="$constraints">
-            <type by_reference="false">array</type>
-          </tag>
-          <tag line="31" name="param" description="" type="array" variable="$indexes">
-            <type by_reference="false">array</type>
-          </tag>
-          <tag line="31" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-        <argument line="40">
-          <name>$name</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-        <argument line="40">
-          <name>$columns</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-        <argument line="40">
-          <name>$constraints</name>
-          <default><![CDATA[array()]]></default>
-          <type>array</type>
-        </argument>
-        <argument line="40">
-          <name>$indexes</name>
-          <default><![CDATA[array()]]></default>
-          <type>array</type>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="96" package="">
-        <name>delete_table</name>
-        <type>function</type>
-        <docblock line="90">
-          <description><![CDATA[Database-specific SQL for dropping a table]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="90" name="param" description="" type="string" variable="$name">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="90" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-        <argument line="96">
-          <name>$name</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="108" package="">
-        <name>backup_structure</name>
-        <type>function</type>
-        <docblock line="103">
-          <description><![CDATA[Create an SQL backup file for the current database's structure]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="103" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="122" package="">
-        <name>backup_data</name>
-        <type>function</type>
-        <docblock line="116">
-          <description><![CDATA[Create an SQL backup file for the current database's data]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="116" name="param" description="" type="array" variable="$exclude">
-            <type by_reference="false">array</type>
-          </tag>
-          <tag line="116" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-        <argument line="122">
-          <name>$exclude</name>
-          <default><![CDATA[array()]]></default>
-          <type/>
-        </argument>
-      </method>
-    </class>
-  </file>
-  <file path="sys/db/drivers/pgsql/pgsql_driver.php" hash="cdd0d50e7f83eea78024ea8e4a4bdd8a" package="Default">
-    <docblock line="2">
-      <description><![CDATA[Query]]></description>
-      <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
-      <tag line="2" name="author" description="Timothy J. Warren"/>
-      <tag line="2" name="copyright" description="Copyright (c) 2012"/>
-      <tag line="2" name="link" description="https://github.com/aviat4ion/Query" link="https://github.com/aviat4ion/Query"/>
-      <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
-    </docblock>
-    <class final="false" abstract="false" namespace="default" line="20" package="Default">
-      <name>pgSQL</name>
-      <full_name>\pgSQL</full_name>
-      <extends>\DB_PDO</extends>
-      <docblock line="15">
-        <description><![CDATA[PostgreSQL specifc class]]></description>
-        <long-description><![CDATA[]]></long-description>
-        <tag line="15" name="extends" description="DB_PDO"/>
-      </docblock>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="30" package="">
-        <name>__construct</name>
-        <type>function</type>
-        <docblock line="22">
-          <description><![CDATA[Connect to a PosgreSQL database]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="22" name="param" description="" type="string" variable="$dsn">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="22" name="param" description="" type="string" variable="$username">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="22" name="param" description="" type="string" variable="$password">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="22" name="param" description="" type="array" variable="$options">
-            <type by_reference="false">array</type>
-          </tag>
-        </docblock>
-        <argument line="30">
-          <name>$dsn</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-        <argument line="30">
-          <name>$username</name>
-          <default><![CDATA[null]]></default>
-          <type/>
-        </argument>
-        <argument line="30">
-          <name>$password</name>
-          <default><![CDATA[null]]></default>
-          <type/>
-        </argument>
-        <argument line="30">
-          <name>$options</name>
-          <default><![CDATA[array()]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="42" package="">
-        <name>switch_db</name>
-        <type>function</type>
-        <docblock line="37">
-          <description><![CDATA[Connect to a different database]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="37" name="param" description="" type="string" variable="$name">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-        <argument line="42">
-          <name>$name</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="55" package="">
-        <name>truncate</name>
-        <type>function</type>
-        <docblock line="50">
-          <description><![CDATA[Empty a table]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="50" name="param" description="" type="string" variable="$table">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-        <argument line="55">
-          <name>$table</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="68" package="">
-        <name>num_rows</name>
-        <type>function</type>
-        <docblock line="63">
-          <description><![CDATA[Return the number of rows returned for a SELECT query]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="63" name="return" description="" type="int">
-            <type by_reference="false">int</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="80" package="">
-        <name>get_schemas</name>
-        <type>function</type>
-        <docblock line="75">
-          <description><![CDATA[Get a list of schemas for the current connection]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="75" name="return" description="" type="array">
-            <type by_reference="false">array</type>
-          </tag>
-        </docblock>
-      </method>
-    </class>
-  </file>
-  <file path="sys/db/drivers/odbc/odbc_util.php" hash="9c08585a33e576b5808073478f42e6a8" package="Default">
-    <docblock line="2">
-      <description><![CDATA[Query]]></description>
-      <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
-      <tag line="2" name="author" description="Timothy J. Warren"/>
-      <tag line="2" name="copyright" description="Copyright (c) 2012"/>
-      <tag line="2" name="link" description="https://github.com/aviat4ion/Query" link="https://github.com/aviat4ion/Query"/>
-      <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
-    </docblock>
-    <class final="false" abstract="false" namespace="default" line="18" package="Default">
-      <name>ODBC_Util</name>
-      <full_name>\ODBC_Util</full_name>
-      <extends>\DB_Util</extends>
-      <docblock line="15">
-        <description><![CDATA[ODBC-specific backup, import and creation methods]]></description>
-        <long-description><![CDATA[]]></long-description>
-      </docblock>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="26" package="">
-        <name>__construct</name>
-        <type>function</type>
-        <docblock line="20">
-          <description><![CDATA[Save a reference to the current connection object]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="20" name="param" description="&amp;$conn" type="object" variable="$conn">
-            <type by_reference="false">object</type>
-          </tag>
-          <tag line="20" name="return" description="" type="void">
-            <type by_reference="false">void</type>
-          </tag>
-        </docblock>
-        <argument line="26">
-          <name>$conn</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="42" package="">
-        <name>create_table</name>
-        <type>function</type>
-        <docblock line="33">
-          <description><![CDATA[Database-specific method to create a new table]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="33" name="param" description="" type="string" variable="$name">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="33" name="param" description="" type="array" variable="$columns">
-            <type by_reference="false">array</type>
-          </tag>
-          <tag line="33" name="param" description="" type="array" variable="$constraints">
-            <type by_reference="false">array</type>
-          </tag>
-          <tag line="33" name="param" description="" type="array" variable="$indexes">
-            <type by_reference="false">array</type>
-          </tag>
-          <tag line="33" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-        <argument line="42">
-          <name>$name</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-        <argument line="42">
-          <name>$columns</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-        <argument line="42">
-          <name>$constraints</name>
-          <default><![CDATA[array()]]></default>
-          <type>array</type>
-        </argument>
-        <argument line="42">
-          <name>$indexes</name>
-          <default><![CDATA[array()]]></default>
-          <type>array</type>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="56" package="">
-        <name>delete_table</name>
-        <type>function</type>
-        <docblock line="50">
-          <description><![CDATA[Remove a table from the database]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="50" name="param" description="" type="string" variable="$name">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="50" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-        <argument line="56">
-          <name>$name</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="68" package="">
-        <name>backup_structure</name>
-        <type>function</type>
-        <docblock line="63">
-          <description><![CDATA[Create an SQL backup file for the current database's structure]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="63" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="81" package="">
-        <name>backup_data</name>
-        <type>function</type>
-        <docblock line="76">
-          <description><![CDATA[Create an SQL backup file for the current database's data]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="76" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-      </method>
-    </class>
-  </file>
-  <file path="sys/db/drivers/odbc/odbc_sql.php" hash="d11ea8c6a612dcfc745eb96a35fbb13e" package="Default">
-    <docblock line="2">
-      <description><![CDATA[Query]]></description>
-      <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
-      <tag line="2" name="author" description="Timothy J. Warren"/>
-      <tag line="2" name="copyright" description="Copyright (c) 2012"/>
-      <tag line="2" name="link" description="https://github.com/aviat4ion/Query" link="https://github.com/aviat4ion/Query"/>
-      <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
-    </docblock>
-    <class final="false" abstract="false" namespace="default" line="18" package="Default">
-      <name>ODBC_SQL</name>
-      <full_name>\ODBC_SQL</full_name>
-      <extends>\DB_SQL</extends>
-      <docblock line="15">
-        <description><![CDATA[ODBC SQL Class]]></description>
-        <long-description><![CDATA[]]></long-description>
-      </docblock>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="28" package="">
-        <name>limit</name>
-        <type>function</type>
-        <docblock line="20">
-          <description><![CDATA[Limit clause]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="20" name="param" description="" type="string" variable="$sql">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="20" name="param" description="" type="int" variable="$limit">
-            <type by_reference="false">int</type>
-          </tag>
-          <tag line="20" name="param" description="" type="int" variable="$offset">
-            <type by_reference="false">int</type>
-          </tag>
-          <tag line="20" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-        <argument line="28">
-          <name>$sql</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-        <argument line="28">
-          <name>$limit</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-        <argument line="28">
-          <name>$offset</name>
-          <default><![CDATA[FALSE]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="40" package="">
-        <name>random</name>
-        <type>function</type>
-        <docblock line="35">
-          <description><![CDATA[Random ordering keyword]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="35" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="52" package="">
-        <name>db_list</name>
-        <type>function</type>
-        <docblock line="47">
-          <description><![CDATA[Returns sql to list other databases]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="47" name="return" description="" type="FALSE">
-            <type by_reference="false">FALSE</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="64" package="">
-        <name>table_list</name>
-        <type>function</type>
-        <docblock line="59">
-          <description><![CDATA[Returns sql to list tables]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="59" name="return" description="" type="FALSE">
-            <type by_reference="false">FALSE</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="76" package="">
-        <name>system_table_list</name>
-        <type>function</type>
-        <docblock line="71">
-          <description><![CDATA[Returns sql to list system tables]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="71" name="return" description="" type="FALSE">
-            <type by_reference="false">FALSE</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="88" package="">
-        <name>view_list</name>
-        <type>function</type>
-        <docblock line="83">
-          <description><![CDATA[Returns sql to list views]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="83" name="return" description="" type="FALSE">
-            <type by_reference="false">FALSE</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="100" package="">
-        <name>trigger_list</name>
-        <type>function</type>
-        <docblock line="95">
-          <description><![CDATA[Returns sql to list triggers]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="95" name="return" description="" type="FALSE">
-            <type by_reference="false">FALSE</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="112" package="">
-        <name>function_list</name>
-        <type>function</type>
-        <docblock line="107">
-          <description><![CDATA[Return sql to list functions]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="107" name="return" description="" type="FALSE">
-            <type by_reference="false">FALSE</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="124" package="">
-        <name>procedure_list</name>
-        <type>function</type>
-        <docblock line="119">
-          <description><![CDATA[Return sql to list stored procedures]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="119" name="return" description="" type="FALSE">
-            <type by_reference="false">FALSE</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="136" package="">
-        <name>sequence_list</name>
-        <type>function</type>
-        <docblock line="131">
-          <description><![CDATA[Return sql to list sequences]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="131" name="return" description="" type="FALSE">
-            <type by_reference="false">FALSE</type>
-          </tag>
-        </docblock>
-      </method>
-    </class>
-  </file>
-  <file path="sys/db/drivers/odbc/odbc_driver.php" hash="ea50bdc8b48526ac9f55263e76689669" package="Default">
-    <docblock line="2">
-      <description><![CDATA[Query]]></description>
-      <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
-      <tag line="2" name="author" description="Timothy J. Warren"/>
-      <tag line="2" name="copyright" description="Copyright (c) 2012"/>
-      <tag line="2" name="link" description="https://github.com/aviat4ion/Query" link="https://github.com/aviat4ion/Query"/>
-      <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
-    </docblock>
-    <class final="false" abstract="false" namespace="default" line="22" package="Default">
-      <name>ODBC</name>
-      <full_name>\ODBC</full_name>
-      <extends>\DB_PDO</extends>
-      <docblock line="15">
-        <description><![CDATA[ODBC Database Driver]]></description>
-        <long-description><![CDATA[<p>For general database access for databases not specified by the main drivers</p>]]></long-description>
-        <tag line="15" name="extends" description="DB_PDO"/>
-      </docblock>
-      <property final="false" static="false" visibility="protected" line="27" package="Default">
-        <name>$escape_char</name>
-        <default><![CDATA['']]></default>
         <docblock line="24">
-          <description><![CDATA[Don't define the escape char - or define it in sub-drivers in a refactor]]></description>
-          <long-description><![CDATA[]]></long-description>
-        </docblock>
-      </property>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="37" package="">
-        <name>__construct</name>
-        <type>function</type>
-        <docblock line="29">
-          <description><![CDATA[Use ODBC to connect to a database]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="29" name="param" description="" type="string" variable="$dsn">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="29" name="param" description="" type="string" variable="$username">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="29" name="param" description="" type="string" variable="$password">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="29" name="param" description="" type="array" variable="$options">
-            <type by_reference="false">array</type>
-          </tag>
-        </docblock>
-        <argument line="37">
-          <name>$dsn</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-        <argument line="37">
-          <name>$username</name>
-          <default><![CDATA[null]]></default>
-          <type/>
-        </argument>
-        <argument line="37">
-          <name>$password</name>
-          <default><![CDATA[null]]></default>
-          <type/>
-        </argument>
-        <argument line="37">
-          <name>$options</name>
-          <default><![CDATA[array()]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="50" package="">
-        <name>switch_db</name>
-        <type>function</type>
-        <docblock line="44">
-          <description><![CDATA[Doesn't apply to ODBC]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="44" name="param" description="" type="string" variable="$name">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="44" name="return" description="" type="bool">
-            <type by_reference="false">bool</type>
-          </tag>
-        </docblock>
-        <argument line="50">
-          <name>$name</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="63" package="">
-        <name>truncate</name>
-        <type>function</type>
-        <docblock line="57">
-          <description><![CDATA[Empty the current database]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="57" name="param" description="" type="string" variable="$table">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="57" name="return" description="" type="void">
-            <type by_reference="false">void</type>
-          </tag>
-        </docblock>
-        <argument line="63">
-          <name>$table</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="76" package="">
-        <name>num_rows</name>
-        <type>function</type>
-        <docblock line="71">
-          <description><![CDATA[Return the number of rows returned for a SELECT query]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="71" name="return" description="" type="int">
-            <type by_reference="false">int</type>
-          </tag>
-        </docblock>
-      </method>
-    </class>
-  </file>
-  <file path="sys/db/drivers/mysql/mysql_util.php" hash="2fc1cb882f14c6fadcd9cc959bc1fe53" package="Default">
-    <docblock line="2">
-      <description><![CDATA[Query]]></description>
-      <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
-      <tag line="2" name="author" description="Timothy J. Warren"/>
-      <tag line="2" name="copyright" description="Copyright (c) 2012"/>
-      <tag line="2" name="link" description="https://github.com/aviat4ion/Query" link="https://github.com/aviat4ion/Query"/>
-      <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
-    </docblock>
-    <class final="false" abstract="false" namespace="default" line="18" package="Default">
-      <name>MySQL_Util</name>
-      <full_name>\MySQL_Util</full_name>
-      <extends>\DB_Util</extends>
-      <docblock line="15">
-        <description><![CDATA[MySQL-specific backup, import and creation methods]]></description>
-        <long-description><![CDATA[]]></long-description>
-      </docblock>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="26" package="">
-        <name>__construct</name>
-        <type>function</type>
-        <docblock line="20">
-          <description><![CDATA[Save a reference to the current connection object]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="20" name="param" description="&amp;$conn" type="object" variable="$conn">
-            <type by_reference="false">object</type>
-          </tag>
-          <tag line="20" name="return" description="" type="void">
-            <type by_reference="false">void</type>
-          </tag>
-        </docblock>
-        <argument line="26">
-          <name>$conn</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="43" package="">
-        <name>create_table</name>
-        <type>function</type>
-        <docblock line="33">
-          <description><![CDATA[Convienience public function for creating a new MySQL table]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="33" name="param" description="" type="string" variable="$name">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="33" name="param" description="" type="array" variable="$columns">
-            <type by_reference="false">array</type>
-          </tag>
-          <tag line="33" name="param" description="" type="array" variable="$constraints">
-            <type by_reference="false">array</type>
-          </tag>
-          <tag line="33" name="param" description="" type="array" variable="$indexes">
-            <type by_reference="false">array</type>
-          </tag>
-          <tag line="33" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-        <argument line="43">
-          <name>$name</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-        <argument line="43">
-          <name>$columns</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-        <argument line="43">
-          <name>$constraints</name>
-          <default><![CDATA[array()]]></default>
-          <type>array</type>
-        </argument>
-        <argument line="43">
-          <name>$indexes</name>
-          <default><![CDATA[array()]]></default>
-          <type>array</type>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="109" package="">
-        <name>delete_table</name>
-        <type>function</type>
-        <docblock line="103">
-          <description><![CDATA[Convience public function for droping a MySQL table]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="103" name="param" description="" type="string" variable="$name">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="103" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-        <argument line="109">
-          <name>$name</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="121" package="">
-        <name>backup_structure</name>
-        <type>function</type>
-        <docblock line="116">
-          <description><![CDATA[Create an SQL backup file for the current database's structure]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="116" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="135" package="">
-        <name>backup_data</name>
-        <type>function</type>
-        <docblock line="129">
-          <description><![CDATA[Create an SQL backup file for the current database's data]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="129" name="param" description="" type="array" variable="$exclude">
-            <type by_reference="false">array</type>
-          </tag>
-          <tag line="129" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-        <argument line="135">
-          <name>$exclude</name>
-          <default><![CDATA[array()]]></default>
-          <type/>
-        </argument>
-      </method>
-    </class>
-  </file>
-  <file path="sys/db/drivers/mysql/mysql_driver.php" hash="711af4a70e7e06ec2c839e0513a7a420" package="Default">
-    <docblock line="2">
-      <description><![CDATA[Query]]></description>
-      <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
-      <tag line="2" name="author" description="Timothy J. Warren"/>
-      <tag line="2" name="copyright" description="Copyright (c) 2012"/>
-      <tag line="2" name="link" description="https://github.com/aviat4ion/Query" link="https://github.com/aviat4ion/Query"/>
-      <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
-    </docblock>
-    <class final="false" abstract="false" namespace="default" line="20" package="Default">
-      <name>MySQL</name>
-      <full_name>\MySQL</full_name>
-      <extends>\DB_PDO</extends>
-      <docblock line="15">
-        <description><![CDATA[MySQL specific class]]></description>
-        <long-description><![CDATA[]]></long-description>
-        <tag line="15" name="extends" description="DB_PDO"/>
-      </docblock>
-      <property final="false" static="false" visibility="protected" line="25" package="Default">
-        <name>$escape_char</name>
-        <default><![CDATA['`']]></default>
-        <docblock line="22">
-          <description><![CDATA[Set the backtick as the MySQL escape character]]></description>
-          <long-description><![CDATA[]]></long-description>
-        </docblock>
-      </property>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="35" package="">
-        <name>__construct</name>
-        <type>function</type>
-        <docblock line="27">
-          <description><![CDATA[Connect to MySQL Database]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="27" name="param" description="" type="string" variable="$dsn">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="27" name="param" description="" type="string" variable="$username">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="27" name="param" description="" type="string" variable="$password">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="27" name="param" description="" type="array" variable="$options">
-            <type by_reference="false">array</type>
-          </tag>
-        </docblock>
-        <argument line="35">
-          <name>$dsn</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-        <argument line="35">
-          <name>$username</name>
-          <default><![CDATA[null]]></default>
-          <type/>
-        </argument>
-        <argument line="35">
-          <name>$password</name>
-          <default><![CDATA[null]]></default>
-          <type/>
-        </argument>
-        <argument line="35">
-          <name>$options</name>
-          <default><![CDATA[array()]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="51" package="">
-        <name>switch_db</name>
-        <type>function</type>
-        <docblock line="46">
-          <description><![CDATA[Connect to a different database]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="46" name="param" description="" type="string" variable="$name">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-        <argument line="51">
-          <name>$name</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="64" package="">
-        <name>truncate</name>
-        <type>function</type>
-        <docblock line="59">
-          <description><![CDATA[Empty a table]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="59" name="param" description="" type="string" variable="$table">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-        <argument line="64">
-          <name>$table</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="76" package="">
-        <name>num_rows</name>
-        <type>function</type>
-        <docblock line="71">
-          <description><![CDATA[Return the number of rows returned for a SELECT query]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="71" name="return" description="" type="int">
-            <type by_reference="false">int</type>
-          </tag>
-        </docblock>
-      </method>
-    </class>
-  </file>
-  <file path="sys/db/drivers/mysql/mysql_sql.php" hash="a9e5198fc2f1af65d1162a2c4d9ce563" package="Default">
-    <docblock line="2">
-      <description><![CDATA[Query]]></description>
-      <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
-      <tag line="2" name="author" description="Timothy J. Warren"/>
-      <tag line="2" name="copyright" description="Copyright (c) 2012"/>
-      <tag line="2" name="link" description="https://github.com/aviat4ion/Query" link="https://github.com/aviat4ion/Query"/>
-      <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
-    </docblock>
-    <class final="false" abstract="false" namespace="default" line="18" package="Default">
-      <name>MySQL_SQL</name>
-      <full_name>\MySQL_SQL</full_name>
-      <extends>\DB_SQL</extends>
-      <docblock line="15">
-        <description><![CDATA[MySQL specifc SQL]]></description>
-        <long-description><![CDATA[]]></long-description>
-      </docblock>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="28" package="">
-        <name>limit</name>
-        <type>function</type>
-        <docblock line="20">
-          <description><![CDATA[Limit clause]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="20" name="param" description="" type="string" variable="$sql">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="20" name="param" description="" type="int" variable="$limit">
-            <type by_reference="false">int</type>
-          </tag>
-          <tag line="20" name="param" description="" type="int" variable="$offset">
-            <type by_reference="false">int</type>
-          </tag>
-          <tag line="20" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-        <argument line="28">
-          <name>$sql</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-        <argument line="28">
-          <name>$limit</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-        <argument line="28">
-          <name>$offset</name>
-          <default><![CDATA[FALSE]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="45" package="">
-        <name>random</name>
-        <type>function</type>
-        <docblock line="40">
-          <description><![CDATA[Random ordering keyword]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="40" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="57" package="">
-        <name>db_list</name>
-        <type>function</type>
-        <docblock line="52">
-          <description><![CDATA[Returns sql to list other databases]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="52" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="69" package="">
-        <name>table_list</name>
-        <type>function</type>
-        <docblock line="64">
-          <description><![CDATA[Returns sql to list tables]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="64" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="81" package="">
-        <name>system_table_list</name>
-        <type>function</type>
-        <docblock line="76">
-          <description><![CDATA[Overridden in MySQL class]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="76" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="94" package="">
-        <name>view_list</name>
-        <type>function</type>
-        <docblock line="89">
-          <description><![CDATA[Returns sql to list views]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="89" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="106" package="">
-        <name>trigger_list</name>
-        <type>function</type>
-        <docblock line="101">
-          <description><![CDATA[Returns sql to list triggers]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="101" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="118" package="">
-        <name>function_list</name>
-        <type>function</type>
-        <docblock line="113">
-          <description><![CDATA[Return sql to list functions]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="113" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="130" package="">
-        <name>procedure_list</name>
-        <type>function</type>
-        <docblock line="125">
-          <description><![CDATA[Return sql to list stored procedures]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="125" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="142" package="">
-        <name>sequence_list</name>
-        <type>function</type>
-        <docblock line="137">
-          <description><![CDATA[Return sql to list sequences]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="137" name="return" description="" type="FALSE">
-            <type by_reference="false">FALSE</type>
-          </tag>
-        </docblock>
-      </method>
-    </class>
-  </file>
-  <file path="sys/db/drivers/sqlite/sqlite_util.php" hash="4b454af7bb62fa27cc6c81d3cb3847da" package="Default">
-    <docblock line="2">
-      <description><![CDATA[Query]]></description>
-      <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
-      <tag line="2" name="author" description="Timothy J. Warren"/>
-      <tag line="2" name="copyright" description="Copyright (c) 2012"/>
-      <tag line="2" name="link" description="https://github.com/aviat4ion/Query" link="https://github.com/aviat4ion/Query"/>
-      <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
-    </docblock>
-    <class final="false" abstract="false" namespace="default" line="18" package="Default">
-      <name>SQLite_Util</name>
-      <full_name>\SQLite_Util</full_name>
-      <extends>\DB_Util</extends>
-      <docblock line="15">
-        <description><![CDATA[SQLite-specific backup, import and creation methods]]></description>
-        <long-description><![CDATA[]]></long-description>
-      </docblock>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="26" package="">
-        <name>__construct</name>
-        <type>function</type>
-        <docblock line="20">
-          <description><![CDATA[Save a reference to the current connection object]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="20" name="param" description="&amp;$conn" type="object" variable="$conn">
-            <type by_reference="false">object</type>
-          </tag>
-          <tag line="20" name="return" description="" type="void">
-            <type by_reference="false">void</type>
-          </tag>
-        </docblock>
-        <argument line="26">
-          <name>$conn</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="42" package="">
-        <name>create_table</name>
-        <type>function</type>
-        <docblock line="33">
-          <description><![CDATA[Convenience public function to create a new table]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="33" name="param" description="//Name of the table" type="string" variable="$name">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="33" name="param" description="//columns as straight array and/or column =&gt; type pairs" type="array" variable="$columns">
-            <type by_reference="false">array</type>
-          </tag>
-          <tag line="33" name="param" description="// column =&gt; constraint pairs" type="array" variable="$constraints">
-            <type by_reference="false">array</type>
-          </tag>
-          <tag line="33" name="param" description="// column =&gt; index pairs" type="array" variable="$indexes">
-            <type by_reference="false">array</type>
-          </tag>
-          <tag line="33" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-        <argument line="42">
-          <name>$name</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-        <argument line="42">
-          <name>$columns</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-        <argument line="42">
-          <name>$constraints</name>
-          <default><![CDATA[array()]]></default>
-          <type>array</type>
-        </argument>
-        <argument line="42">
-          <name>$indexes</name>
-          <default><![CDATA[array()]]></default>
-          <type>array</type>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="98" package="">
-        <name>delete_table</name>
-        <type>function</type>
-        <docblock line="92">
-          <description><![CDATA[SQL to drop the specified table]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="92" name="param" description="" type="string" variable="$name">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="92" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-        <argument line="98">
-          <name>$name</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="111" package="">
-        <name>backup_data</name>
-        <type>function</type>
-        <docblock line="105">
-          <description><![CDATA[Create an SQL backup file for the current database's data]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="105" name="param" description="" type="array" variable="$excluded">
-            <type by_reference="false">array</type>
-          </tag>
-          <tag line="105" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-        <argument line="111">
-          <name>$excluded</name>
-          <default><![CDATA[array()]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="175" package="">
-        <name>backup_structure</name>
-        <type>function</type>
-        <docblock line="170">
-          <description><![CDATA[Create an SQL backup file for the current database's structure]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="170" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-      </method>
-    </class>
-  </file>
-  <file path="sys/db/drivers/sqlite/sqlite_driver.php" hash="ee83f4857458949ae43ed19fe2599bc2" package="Default">
-    <docblock line="2">
-      <description><![CDATA[Query]]></description>
-      <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
-      <tag line="2" name="author" description="Timothy J. Warren"/>
-      <tag line="2" name="copyright" description="Copyright (c) 2012"/>
-      <tag line="2" name="link" description="https://github.com/aviat4ion/Query" link="https://github.com/aviat4ion/Query"/>
-      <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
-    </docblock>
-    <class final="false" abstract="false" namespace="default" line="20" package="Default">
-      <name>SQLite</name>
-      <full_name>\SQLite</full_name>
-      <extends>\DB_PDO</extends>
-      <docblock line="15">
-        <description><![CDATA[SQLite specific class]]></description>
-        <long-description><![CDATA[]]></long-description>
-        <tag line="15" name="extends" description="DB_PDO"/>
-      </docblock>
-      <property final="false" static="false" visibility="protected" line="25" package="Default">
-        <name>$statement</name>
-        <default><![CDATA[]]></default>
-        <docblock line="22">
-          <description><![CDATA[Reference to the last executed sql query]]></description>
+          <description><![CDATA[Reference to the current connection object]]></description>
           <long-description><![CDATA[]]></long-description>
         </docblock>
       </property>
       <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="34" package="">
         <name>__construct</name>
         <type>function</type>
-        <docblock line="27">
-          <description><![CDATA[Open SQLite Database]]></description>
+        <docblock line="29">
+          <description><![CDATA[Save a reference to the connection object for later use]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="27" name="param" description="" type="string" variable="$dsn">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="27" name="param" description="" type="string" variable="$user">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="27" name="param" description="" type="string" variable="$pass">
-            <type by_reference="false">string</type>
+          <tag line="29" name="param" description="&amp;$conn" type="object" variable="$conn">
+            <type by_reference="false">object</type>
           </tag>
         </docblock>
         <argument line="34">
-          <name>$dsn</name>
+          <name>$conn</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="34">
-          <name>$user</name>
-          <default><![CDATA[NULL]]></default>
-          <type/>
-        </argument>
-        <argument line="34">
-          <name>$pass</name>
-          <default><![CDATA[NULL]]></default>
-          <type/>
-        </argument>
       </method>
       <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="47" package="">
+        <name>__call</name>
+        <type>function</type>
+        <docblock line="41">
+          <description><![CDATA[Enable calling driver methods]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="41" name="param" description="" type="string" variable="$method">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="41" name="param" description="" type="array" variable="$args">
+            <type by_reference="false">array</type>
+          </tag>
+        </docblock>
+        <argument line="47">
+          <name>$method</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+        <argument line="47">
+          <name>$args</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="71" package="">
+        <name>create_table</name>
+        <type>function</type>
+        <docblock line="61">
+          <description><![CDATA[Get database-specific sql to create a new table]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="61" name="abstract" description=""/>
+          <tag line="61" name="param" description="" type="string" variable="$name">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="61" name="param" description="" type="array" variable="$columns">
+            <type by_reference="false">array</type>
+          </tag>
+          <tag line="61" name="param" description="" type="array" variable="$constraints">
+            <type by_reference="false">array</type>
+          </tag>
+          <tag line="61" name="param" description="" type="array" variable="$indexes">
+            <type by_reference="false">array</type>
+          </tag>
+          <tag line="61" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+        <argument line="71">
+          <name>$name</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+        <argument line="71">
+          <name>$columns</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+        <argument line="71">
+          <name>$constraints</name>
+          <default><![CDATA[array()]]></default>
+          <type>array</type>
+        </argument>
+        <argument line="71">
+          <name>$indexes</name>
+          <default><![CDATA[array()]]></default>
+          <type>array</type>
+        </argument>
+      </method>
+      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="80" package="">
+        <name>delete_table</name>
+        <type>function</type>
+        <docblock line="73">
+          <description><![CDATA[Get database-specific sql to drop a table]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="73" name="abstract" description=""/>
+          <tag line="73" name="param" description="" type="string" variable="$name">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="73" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+        <argument line="80">
+          <name>$name</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="88" package="">
+        <name>backup_structure</name>
+        <type>function</type>
+        <docblock line="82">
+          <description><![CDATA[Return an SQL file with the database table structure]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="82" name="abstract" description=""/>
+          <tag line="82" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="true" static="false" visibility="public" namespace="default" line="96" package="">
+        <name>backup_data</name>
+        <type>function</type>
+        <docblock line="90">
+          <description><![CDATA[Return an SQL file with the database data as insert statements]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="90" name="abstract" description=""/>
+          <tag line="90" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+      </method>
+    </class>
+  </file>
+  <file path="sys/db/autoload.php" hash="70540d25cb0bccfcfcd8d495d7cfab57" package="Query">
+    <docblock line="2">
+      <description><![CDATA[Query]]></description>
+      <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
+      <tag line="2" name="package" description="Query"/>
+      <tag line="2" name="author" description="Timothy J. Warren"/>
+      <tag line="2" name="copyright" description="Copyright (c) 2012"/>
+      <tag line="2" name="link" description="https://github.com/aviat4ion/Query" link="https://github.com/aviat4ion/Query"/>
+      <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
+    </docblock>
+    <constant namespace="default" line="23" package="Default">
+      <name>BASE_PATH</name>
+      <value><![CDATA[dirname(__FILE__).'/']]></value>
+      <docblock line="20">
+        <description><![CDATA[Reference to root path]]></description>
+        <long-description><![CDATA[]]></long-description>
+      </docblock>
+    </constant>
+    <constant namespace="default" line="28" package="Default">
+      <name>DRIVER_PATH</name>
+      <value><![CDATA[BASE_PATH.'drivers/']]></value>
+      <docblock line="25">
+        <description><![CDATA[Path to driver classes]]></description>
+        <long-description><![CDATA[]]></long-description>
+      </docblock>
+    </constant>
+    <function namespace="default" line="39" package="Query">
+      <name>do_include</name>
+      <type>function</type>
+      <docblock line="32">
+        <description><![CDATA[Bulk directory loading workaround for use
+with array_map and glob]]></description>
+        <long-description><![CDATA[]]></long-description>
+        <tag line="32" name="param" description="" type="string" variable="$path">
+          <type by_reference="false">string</type>
+        </tag>
+        <tag line="32" name="return" description="" type="void">
+          <type by_reference="false">void</type>
+        </tag>
+      </docblock>
+      <argument line="39">
+        <name>$path</name>
+        <default><![CDATA[]]></default>
+        <type/>
+      </argument>
+    </function>
+    <function namespace="default" line="74" package="Query">
+      <name>db_filter</name>
+      <type>function</type>
+      <docblock line="67">
+        <description><![CDATA[Filter out db rows into one array]]></description>
+        <long-description><![CDATA[]]></long-description>
+        <tag line="67" name="param" description="" type="array" variable="$array">
+          <type by_reference="false">array</type>
+        </tag>
+        <tag line="67" name="param" description="" type="mixed" variable="$index">
+          <type by_reference="false">mixed</type>
+        </tag>
+        <tag line="67" name="return" description="" type="array">
+          <type by_reference="false">array</type>
+        </tag>
+      </docblock>
+      <argument line="74">
+        <name>$array</name>
+        <default><![CDATA[]]></default>
+        <type/>
+      </argument>
+      <argument line="74">
+        <name>$index</name>
+        <default><![CDATA[]]></default>
+        <type/>
+      </argument>
+    </function>
+  </file>
+  <file path="sys/db/drivers/pgsql/pgsql_sql.php" hash="28f1fe85be6eba57e8ec7373f885faec" package="Default">
+    <docblock line="2">
+      <description><![CDATA[Query]]></description>
+      <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
+      <tag line="2" name="author" description="Timothy J. Warren"/>
+      <tag line="2" name="copyright" description="Copyright (c) 2012"/>
+      <tag line="2" name="link" description="https://github.com/aviat4ion/Query" link="https://github.com/aviat4ion/Query"/>
+      <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
+    </docblock>
+    <class final="false" abstract="false" namespace="default" line="21" package="Query\Drivers">
+      <name>PgSQL_SQL</name>
+      <full_name>\PgSQL_SQL</full_name>
+      <extends>\DB_SQL</extends>
+      <docblock line="15">
+        <description><![CDATA[PostgreSQL specifc SQL]]></description>
+        <long-description><![CDATA[]]></long-description>
+        <tag line="15" name="package" description="Query"/>
+        <tag line="15" name="subpackage" description="Drivers"/>
+      </docblock>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="31" package="">
+        <name>limit</name>
+        <type>function</type>
+        <docblock line="23">
+          <description><![CDATA[Limit clause]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="23" name="param" description="" type="string" variable="$sql">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="23" name="param" description="" type="int" variable="$limit">
+            <type by_reference="false">int</type>
+          </tag>
+          <tag line="23" name="param" description="" type="int" variable="$offset">
+            <type by_reference="false">int</type>
+          </tag>
+          <tag line="23" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+        <argument line="31">
+          <name>$sql</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+        <argument line="31">
+          <name>$limit</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+        <argument line="31">
+          <name>$offset</name>
+          <default><![CDATA[FALSE]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="50" package="">
+        <name>random</name>
+        <type>function</type>
+        <docblock line="45">
+          <description><![CDATA[Random ordering keyword]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="45" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="62" package="">
+        <name>db_list</name>
+        <type>function</type>
+        <docblock line="57">
+          <description><![CDATA[Returns sql to list other databases]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="57" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="78" package="">
+        <name>table_list</name>
+        <type>function</type>
+        <docblock line="73">
+          <description><![CDATA[Returns sql to list tables]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="73" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="96" package="">
+        <name>system_table_list</name>
+        <type>function</type>
+        <docblock line="91">
+          <description><![CDATA[Returns sql to list system tables]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="91" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="114" package="">
+        <name>view_list</name>
+        <type>function</type>
+        <docblock line="109">
+          <description><![CDATA[Returns sql to list views]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="109" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="132" package="">
+        <name>trigger_list</name>
+        <type>function</type>
+        <docblock line="127">
+          <description><![CDATA[Returns sql to list triggers]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="127" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="149" package="">
+        <name>function_list</name>
+        <type>function</type>
+        <docblock line="144">
+          <description><![CDATA[Return sql to list functions]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="144" name="return" description="" type="FALSE">
+            <type by_reference="false">FALSE</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="161" package="">
+        <name>procedure_list</name>
+        <type>function</type>
+        <docblock line="156">
+          <description><![CDATA[Return sql to list stored procedures]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="156" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="179" package="">
+        <name>sequence_list</name>
+        <type>function</type>
+        <docblock line="174">
+          <description><![CDATA[Return sql to list sequences]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="174" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="197" package="">
+        <name>column_list</name>
+        <type>function</type>
+        <docblock line="191">
+          <description><![CDATA[Return sql to list columns of the specified table]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="191" name="param" description="" type="string" variable="$table">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="191" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+        <argument line="197">
+          <name>$table</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+      </method>
+    </class>
+  </file>
+  <file path="sys/db/drivers/pgsql/pgsql_util.php" hash="5bc6c47b681f4bdbb9385d8101666760" package="Query">
+    <docblock line="2">
+      <description><![CDATA[Query]]></description>
+      <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
+      <tag line="2" name="package" description="Query"/>
+      <tag line="2" name="author" description="Timothy J. Warren"/>
+      <tag line="2" name="copyright" description="Copyright (c) 2012"/>
+      <tag line="2" name="link" description="https://github.com/aviat4ion/Query" link="https://github.com/aviat4ion/Query"/>
+      <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
+    </docblock>
+    <class final="false" abstract="false" namespace="default" line="22" package="Query\Drivers">
+      <name>PgSQL_Util</name>
+      <full_name>\PgSQL_Util</full_name>
+      <extends>\DB_Util</extends>
+      <docblock line="16">
+        <description><![CDATA[Posgres-specific backup, import and creation methods]]></description>
+        <long-description><![CDATA[]]></long-description>
+        <tag line="16" name="package" description="Query"/>
+        <tag line="16" name="subpackage" description="Drivers"/>
+      </docblock>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="30" package="">
+        <name>__construct</name>
+        <type>function</type>
+        <docblock line="24">
+          <description><![CDATA[Save a reference to the current connection object]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="24" name="param" description="&amp;$conn" type="object" variable="$conn">
+            <type by_reference="false">object</type>
+          </tag>
+          <tag line="24" name="return" description="" type="void">
+            <type by_reference="false">void</type>
+          </tag>
+        </docblock>
+        <argument line="30">
+          <name>$conn</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="44" package="">
+        <name>create_table</name>
+        <type>function</type>
+        <docblock line="35">
+          <description><![CDATA[Database-specific method to create a new table]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="35" name="param" description="" type="string" variable="$name">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="35" name="param" description="" type="array" variable="$columns">
+            <type by_reference="false">array</type>
+          </tag>
+          <tag line="35" name="param" description="" type="array" variable="$constraints">
+            <type by_reference="false">array</type>
+          </tag>
+          <tag line="35" name="param" description="" type="array" variable="$indexes">
+            <type by_reference="false">array</type>
+          </tag>
+          <tag line="35" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+        <argument line="44">
+          <name>$name</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+        <argument line="44">
+          <name>$columns</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+        <argument line="44">
+          <name>$constraints</name>
+          <default><![CDATA[array()]]></default>
+          <type>array</type>
+        </argument>
+        <argument line="44">
+          <name>$indexes</name>
+          <default><![CDATA[array()]]></default>
+          <type>array</type>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="100" package="">
+        <name>delete_table</name>
+        <type>function</type>
+        <docblock line="94">
+          <description><![CDATA[Database-specific SQL for dropping a table]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="94" name="param" description="" type="string" variable="$name">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="94" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+        <argument line="100">
+          <name>$name</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="112" package="">
+        <name>backup_structure</name>
+        <type>function</type>
+        <docblock line="107">
+          <description><![CDATA[Create an SQL backup file for the current database's structure]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="107" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="126" package="">
+        <name>backup_data</name>
+        <type>function</type>
+        <docblock line="120">
+          <description><![CDATA[Create an SQL backup file for the current database's data]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="120" name="param" description="" type="array" variable="$exclude">
+            <type by_reference="false">array</type>
+          </tag>
+          <tag line="120" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+        <argument line="126">
+          <name>$exclude</name>
+          <default><![CDATA[array()]]></default>
+          <type/>
+        </argument>
+      </method>
+    </class>
+  </file>
+  <file path="sys/db/drivers/pgsql/pgsql_driver.php" hash="919d2b14b31b9f65e01f481520267710" package="Query">
+    <docblock line="2">
+      <description><![CDATA[Query]]></description>
+      <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
+      <tag line="2" name="package" description="Query"/>
+      <tag line="2" name="author" description="Timothy J. Warren"/>
+      <tag line="2" name="copyright" description="Copyright (c) 2012"/>
+      <tag line="2" name="link" description="https://github.com/aviat4ion/Query" link="https://github.com/aviat4ion/Query"/>
+      <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
+    </docblock>
+    <class final="false" abstract="false" namespace="default" line="22" package="Query\Drivers">
+      <name>PgSQL</name>
+      <full_name>\PgSQL</full_name>
+      <extends>\DB_PDO</extends>
+      <docblock line="16">
+        <description><![CDATA[PostgreSQL specifc class]]></description>
+        <long-description><![CDATA[]]></long-description>
+        <tag line="16" name="package" description="Query"/>
+        <tag line="16" name="subpackage" description="Drivers"/>
+      </docblock>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="32" package="">
+        <name>__construct</name>
+        <type>function</type>
+        <docblock line="24">
+          <description><![CDATA[Connect to a PosgreSQL database]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="24" name="param" description="" type="string" variable="$dsn">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="24" name="param" description="" type="string" variable="$username">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="24" name="param" description="" type="string" variable="$password">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="24" name="param" description="" type="array" variable="$options">
+            <type by_reference="false">array</type>
+          </tag>
+        </docblock>
+        <argument line="32">
+          <name>$dsn</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+        <argument line="32">
+          <name>$username</name>
+          <default><![CDATA[null]]></default>
+          <type/>
+        </argument>
+        <argument line="32">
+          <name>$password</name>
+          <default><![CDATA[null]]></default>
+          <type/>
+        </argument>
+        <argument line="32">
+          <name>$options</name>
+          <default><![CDATA[array()]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="44" package="">
         <name>switch_db</name>
         <type>function</type>
-        <docblock line="42">
-          <description><![CDATA[Doesn't apply to sqlite]]></description>
+        <docblock line="39">
+          <description><![CDATA[Connect to a different database]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="42" name="param" description="" type="string" variable="$name">
+          <tag line="39" name="param" description="" type="string" variable="$name">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+        <argument line="44">
+          <name>$name</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="57" package="">
+        <name>truncate</name>
+        <type>function</type>
+        <docblock line="52">
+          <description><![CDATA[Empty a table]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="52" name="param" description="" type="string" variable="$table">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+        <argument line="57">
+          <name>$table</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="70" package="">
+        <name>num_rows</name>
+        <type>function</type>
+        <docblock line="65">
+          <description><![CDATA[Return the number of rows returned for a SELECT query]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="65" name="return" description="" type="int">
+            <type by_reference="false">int</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="82" package="">
+        <name>get_schemas</name>
+        <type>function</type>
+        <docblock line="77">
+          <description><![CDATA[Get a list of schemas for the current connection]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="77" name="return" description="" type="array">
+            <type by_reference="false">array</type>
+          </tag>
+        </docblock>
+      </method>
+    </class>
+  </file>
+  <file path="sys/db/drivers/odbc/odbc_util.php" hash="e3254c43700cf53c79566c0590e5ca29" package="Query">
+    <docblock line="2">
+      <description><![CDATA[Query]]></description>
+      <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
+      <tag line="2" name="package" description="Query"/>
+      <tag line="2" name="author" description="Timothy J. Warren"/>
+      <tag line="2" name="copyright" description="Copyright (c) 2012"/>
+      <tag line="2" name="link" description="https://github.com/aviat4ion/Query" link="https://github.com/aviat4ion/Query"/>
+      <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
+    </docblock>
+    <class final="false" abstract="false" namespace="default" line="22" package="Query\Drivers">
+      <name>ODBC_Util</name>
+      <full_name>\ODBC_Util</full_name>
+      <extends>\DB_Util</extends>
+      <docblock line="16">
+        <description><![CDATA[ODBC-specific backup, import and creation methods]]></description>
+        <long-description><![CDATA[]]></long-description>
+        <tag line="16" name="package" description="Query"/>
+        <tag line="16" name="subpackage" description="Drivers"/>
+      </docblock>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="30" package="">
+        <name>__construct</name>
+        <type>function</type>
+        <docblock line="24">
+          <description><![CDATA[Save a reference to the current connection object]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="24" name="param" description="&amp;$conn" type="object" variable="$conn">
+            <type by_reference="false">object</type>
+          </tag>
+          <tag line="24" name="return" description="" type="void">
+            <type by_reference="false">void</type>
+          </tag>
+        </docblock>
+        <argument line="30">
+          <name>$conn</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="46" package="">
+        <name>create_table</name>
+        <type>function</type>
+        <docblock line="37">
+          <description><![CDATA[Database-specific method to create a new table]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="37" name="param" description="" type="string" variable="$name">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="37" name="param" description="" type="array" variable="$columns">
+            <type by_reference="false">array</type>
+          </tag>
+          <tag line="37" name="param" description="" type="array" variable="$constraints">
+            <type by_reference="false">array</type>
+          </tag>
+          <tag line="37" name="param" description="" type="array" variable="$indexes">
+            <type by_reference="false">array</type>
+          </tag>
+          <tag line="37" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+        <argument line="46">
+          <name>$name</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+        <argument line="46">
+          <name>$columns</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+        <argument line="46">
+          <name>$constraints</name>
+          <default><![CDATA[array()]]></default>
+          <type>array</type>
+        </argument>
+        <argument line="46">
+          <name>$indexes</name>
+          <default><![CDATA[array()]]></default>
+          <type>array</type>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="60" package="">
+        <name>delete_table</name>
+        <type>function</type>
+        <docblock line="54">
+          <description><![CDATA[Remove a table from the database]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="54" name="param" description="" type="string" variable="$name">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="54" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+        <argument line="60">
+          <name>$name</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="72" package="">
+        <name>backup_structure</name>
+        <type>function</type>
+        <docblock line="67">
+          <description><![CDATA[Create an SQL backup file for the current database's structure]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="67" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="85" package="">
+        <name>backup_data</name>
+        <type>function</type>
+        <docblock line="80">
+          <description><![CDATA[Create an SQL backup file for the current database's data]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="80" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+      </method>
+    </class>
+  </file>
+  <file path="sys/db/drivers/odbc/odbc_sql.php" hash="e13c5f4cb9739325d812c8aeb33e8f52" package="Query">
+    <docblock line="2">
+      <description><![CDATA[Query]]></description>
+      <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
+      <tag line="2" name="package" description="Query"/>
+      <tag line="2" name="author" description="Timothy J. Warren"/>
+      <tag line="2" name="copyright" description="Copyright (c) 2012"/>
+      <tag line="2" name="link" description="https://github.com/aviat4ion/Query" link="https://github.com/aviat4ion/Query"/>
+      <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
+    </docblock>
+    <class final="false" abstract="false" namespace="default" line="22" package="Query\Drivers">
+      <name>ODBC_SQL</name>
+      <full_name>\ODBC_SQL</full_name>
+      <extends>\DB_SQL</extends>
+      <docblock line="16">
+        <description><![CDATA[ODBC SQL Class]]></description>
+        <long-description><![CDATA[]]></long-description>
+        <tag line="16" name="package" description="Query"/>
+        <tag line="16" name="subpackage" description="Drivers"/>
+      </docblock>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="32" package="">
+        <name>limit</name>
+        <type>function</type>
+        <docblock line="24">
+          <description><![CDATA[Limit clause]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="24" name="param" description="" type="string" variable="$sql">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="24" name="param" description="" type="int" variable="$limit">
+            <type by_reference="false">int</type>
+          </tag>
+          <tag line="24" name="param" description="" type="int" variable="$offset">
+            <type by_reference="false">int</type>
+          </tag>
+          <tag line="24" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+        <argument line="32">
+          <name>$sql</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+        <argument line="32">
+          <name>$limit</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+        <argument line="32">
+          <name>$offset</name>
+          <default><![CDATA[FALSE]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="44" package="">
+        <name>random</name>
+        <type>function</type>
+        <docblock line="39">
+          <description><![CDATA[Random ordering keyword]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="39" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="56" package="">
+        <name>db_list</name>
+        <type>function</type>
+        <docblock line="51">
+          <description><![CDATA[Returns sql to list other databases]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="51" name="return" description="" type="FALSE">
+            <type by_reference="false">FALSE</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="68" package="">
+        <name>table_list</name>
+        <type>function</type>
+        <docblock line="63">
+          <description><![CDATA[Returns sql to list tables]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="63" name="return" description="" type="FALSE">
+            <type by_reference="false">FALSE</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="80" package="">
+        <name>system_table_list</name>
+        <type>function</type>
+        <docblock line="75">
+          <description><![CDATA[Returns sql to list system tables]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="75" name="return" description="" type="FALSE">
+            <type by_reference="false">FALSE</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="92" package="">
+        <name>view_list</name>
+        <type>function</type>
+        <docblock line="87">
+          <description><![CDATA[Returns sql to list views]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="87" name="return" description="" type="FALSE">
+            <type by_reference="false">FALSE</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="104" package="">
+        <name>trigger_list</name>
+        <type>function</type>
+        <docblock line="99">
+          <description><![CDATA[Returns sql to list triggers]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="99" name="return" description="" type="FALSE">
+            <type by_reference="false">FALSE</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="116" package="">
+        <name>function_list</name>
+        <type>function</type>
+        <docblock line="111">
+          <description><![CDATA[Return sql to list functions]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="111" name="return" description="" type="FALSE">
+            <type by_reference="false">FALSE</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="128" package="">
+        <name>procedure_list</name>
+        <type>function</type>
+        <docblock line="123">
+          <description><![CDATA[Return sql to list stored procedures]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="123" name="return" description="" type="FALSE">
+            <type by_reference="false">FALSE</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="140" package="">
+        <name>sequence_list</name>
+        <type>function</type>
+        <docblock line="135">
+          <description><![CDATA[Return sql to list sequences]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="135" name="return" description="" type="FALSE">
+            <type by_reference="false">FALSE</type>
+          </tag>
+        </docblock>
+      </method>
+    </class>
+  </file>
+  <file path="sys/db/drivers/odbc/odbc_driver.php" hash="9a75524ebaa886b116e74ab7572a1802" package="Query">
+    <docblock line="2">
+      <description><![CDATA[Query]]></description>
+      <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
+      <tag line="2" name="package" description="Query"/>
+      <tag line="2" name="author" description="Timothy J. Warren"/>
+      <tag line="2" name="copyright" description="Copyright (c) 2012"/>
+      <tag line="2" name="link" description="https://github.com/aviat4ion/Query" link="https://github.com/aviat4ion/Query"/>
+      <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
+    </docblock>
+    <class final="false" abstract="false" namespace="default" line="24" package="Query\Drivers">
+      <name>ODBC</name>
+      <full_name>\ODBC</full_name>
+      <extends>\DB_PDO</extends>
+      <docblock line="16">
+        <description><![CDATA[ODBC Database Driver]]></description>
+        <long-description><![CDATA[<p>For general database access for databases not specified by the main drivers</p>]]></long-description>
+        <tag line="16" name="package" description="Query"/>
+        <tag line="16" name="subpackage" description="Drivers"/>
+      </docblock>
+      <property final="false" static="false" visibility="protected" line="29" package="Default">
+        <name>$escape_char</name>
+        <default><![CDATA['']]></default>
+        <docblock line="26">
+          <description><![CDATA[Don't define the escape char - or define it in sub-drivers in a refactor]]></description>
+          <long-description><![CDATA[]]></long-description>
+        </docblock>
+      </property>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="39" package="">
+        <name>__construct</name>
+        <type>function</type>
+        <docblock line="31">
+          <description><![CDATA[Use ODBC to connect to a database]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="31" name="param" description="" type="string" variable="$dsn">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="31" name="param" description="" type="string" variable="$username">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="31" name="param" description="" type="string" variable="$password">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="31" name="param" description="" type="array" variable="$options">
+            <type by_reference="false">array</type>
+          </tag>
+        </docblock>
+        <argument line="39">
+          <name>$dsn</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+        <argument line="39">
+          <name>$username</name>
+          <default><![CDATA[null]]></default>
+          <type/>
+        </argument>
+        <argument line="39">
+          <name>$password</name>
+          <default><![CDATA[null]]></default>
+          <type/>
+        </argument>
+        <argument line="39">
+          <name>$options</name>
+          <default><![CDATA[array()]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="52" package="">
+        <name>switch_db</name>
+        <type>function</type>
+        <docblock line="46">
+          <description><![CDATA[Doesn't apply to ODBC]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="46" name="param" description="" type="string" variable="$name">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="46" name="return" description="" type="bool">
+            <type by_reference="false">bool</type>
+          </tag>
+        </docblock>
+        <argument line="52">
+          <name>$name</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="65" package="">
+        <name>truncate</name>
+        <type>function</type>
+        <docblock line="59">
+          <description><![CDATA[Empty the current database]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="59" name="param" description="" type="string" variable="$table">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="59" name="return" description="" type="void">
+            <type by_reference="false">void</type>
+          </tag>
+        </docblock>
+        <argument line="65">
+          <name>$table</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="78" package="">
+        <name>num_rows</name>
+        <type>function</type>
+        <docblock line="73">
+          <description><![CDATA[Return the number of rows returned for a SELECT query]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="73" name="return" description="" type="int">
+            <type by_reference="false">int</type>
+          </tag>
+        </docblock>
+      </method>
+    </class>
+  </file>
+  <file path="sys/db/drivers/mysql/mysql_util.php" hash="e6dbdd9b0b965f7e09ee0638ed4a7a35" package="Query">
+    <docblock line="2">
+      <description><![CDATA[Query]]></description>
+      <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
+      <tag line="2" name="package" description="Query"/>
+      <tag line="2" name="author" description="Timothy J. Warren"/>
+      <tag line="2" name="copyright" description="Copyright (c) 2012"/>
+      <tag line="2" name="link" description="https://github.com/aviat4ion/Query" link="https://github.com/aviat4ion/Query"/>
+      <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
+    </docblock>
+    <class final="false" abstract="false" namespace="default" line="22" package="Query\Drivers">
+      <name>MySQL_Util</name>
+      <full_name>\MySQL_Util</full_name>
+      <extends>\DB_Util</extends>
+      <docblock line="16">
+        <description><![CDATA[MySQL-specific backup, import and creation methods]]></description>
+        <long-description><![CDATA[]]></long-description>
+        <tag line="16" name="package" description="Query"/>
+        <tag line="16" name="subpackage" description="Drivers"/>
+      </docblock>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="30" package="">
+        <name>__construct</name>
+        <type>function</type>
+        <docblock line="24">
+          <description><![CDATA[Save a reference to the current connection object]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="24" name="param" description="&amp;$conn" type="object" variable="$conn">
+            <type by_reference="false">object</type>
+          </tag>
+          <tag line="24" name="return" description="" type="void">
+            <type by_reference="false">void</type>
+          </tag>
+        </docblock>
+        <argument line="30">
+          <name>$conn</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="47" package="">
+        <name>create_table</name>
+        <type>function</type>
+        <docblock line="37">
+          <description><![CDATA[Convienience public function for creating a new MySQL table]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="37" name="param" description="" type="string" variable="$name">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="37" name="param" description="" type="array" variable="$columns">
+            <type by_reference="false">array</type>
+          </tag>
+          <tag line="37" name="param" description="" type="array" variable="$constraints">
+            <type by_reference="false">array</type>
+          </tag>
+          <tag line="37" name="param" description="" type="array" variable="$indexes">
+            <type by_reference="false">array</type>
+          </tag>
+          <tag line="37" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
@@ -3697,190 +3198,284 @@ with array_map and glob]]></description>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
+        <argument line="47">
+          <name>$columns</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+        <argument line="47">
+          <name>$constraints</name>
+          <default><![CDATA[array()]]></default>
+          <type>array</type>
+        </argument>
+        <argument line="47">
+          <name>$indexes</name>
+          <default><![CDATA[array()]]></default>
+          <type>array</type>
+        </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="59" package="">
-        <name>truncate</name>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="113" package="">
+        <name>delete_table</name>
         <type>function</type>
-        <docblock line="54">
-          <description><![CDATA[Empty a table]]></description>
+        <docblock line="107">
+          <description><![CDATA[Convience public function for droping a table]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="54" name="param" description="" type="string" variable="$table">
+          <tag line="107" name="param" description="" type="string" variable="$name">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="107" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
-        <argument line="59">
+        <argument line="113">
+          <name>$name</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="125" package="">
+        <name>backup_structure</name>
+        <type>function</type>
+        <docblock line="120">
+          <description><![CDATA[Create an SQL backup file for the current database's structure]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="120" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="139" package="">
+        <name>backup_data</name>
+        <type>function</type>
+        <docblock line="133">
+          <description><![CDATA[Create an SQL backup file for the current database's data]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="133" name="param" description="" type="array" variable="$exclude">
+            <type by_reference="false">array</type>
+          </tag>
+          <tag line="133" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+        <argument line="139">
+          <name>$exclude</name>
+          <default><![CDATA[array()]]></default>
+          <type/>
+        </argument>
+      </method>
+    </class>
+  </file>
+  <file path="sys/db/drivers/mysql/mysql_driver.php" hash="73b96a679f7c6d0e2bde4bc65399f15c" package="Query">
+    <docblock line="2">
+      <description><![CDATA[Query]]></description>
+      <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
+      <tag line="2" name="package" description="Query"/>
+      <tag line="2" name="author" description="Timothy J. Warren"/>
+      <tag line="2" name="copyright" description="Copyright (c) 2012"/>
+      <tag line="2" name="link" description="https://github.com/aviat4ion/Query" link="https://github.com/aviat4ion/Query"/>
+      <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
+    </docblock>
+    <class final="false" abstract="false" namespace="default" line="22" package="Query\Drivers">
+      <name>MySQL</name>
+      <full_name>\MySQL</full_name>
+      <extends>\DB_PDO</extends>
+      <docblock line="16">
+        <description><![CDATA[MySQL specific class]]></description>
+        <long-description><![CDATA[]]></long-description>
+        <tag line="16" name="package" description="Query"/>
+        <tag line="16" name="subpackage" description="Drivers"/>
+      </docblock>
+      <property final="false" static="false" visibility="protected" line="29" package="Default">
+        <name>$escape_char</name>
+        <default><![CDATA['`']]></default>
+        <docblock line="24">
+          <description><![CDATA[Set the backtick as the MySQL escape character]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="24" name="var" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+      </property>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="39" package="">
+        <name>__construct</name>
+        <type>function</type>
+        <docblock line="31">
+          <description><![CDATA[Connect to MySQL Database]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="31" name="param" description="" type="string" variable="$dsn">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="31" name="param" description="" type="string" variable="$username">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="31" name="param" description="" type="string" variable="$password">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="31" name="param" description="" type="array" variable="$options">
+            <type by_reference="false">array</type>
+          </tag>
+        </docblock>
+        <argument line="39">
+          <name>$dsn</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+        <argument line="39">
+          <name>$username</name>
+          <default><![CDATA[null]]></default>
+          <type/>
+        </argument>
+        <argument line="39">
+          <name>$password</name>
+          <default><![CDATA[null]]></default>
+          <type/>
+        </argument>
+        <argument line="39">
+          <name>$options</name>
+          <default><![CDATA[array()]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="55" package="">
+        <name>switch_db</name>
+        <type>function</type>
+        <docblock line="50">
+          <description><![CDATA[Connect to a different database]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="50" name="param" description="" type="string" variable="$name">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+        <argument line="55">
+          <name>$name</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="68" package="">
+        <name>truncate</name>
+        <type>function</type>
+        <docblock line="63">
+          <description><![CDATA[Empty a table]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="63" name="param" description="" type="string" variable="$table">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+        <argument line="68">
           <name>$table</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="77" package="">
-        <name>get_tables</name>
-        <type>function</type>
-        <docblock line="72">
-          <description><![CDATA[List tables for the current database]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="72" name="return" description="" type="mixed">
-            <type by_reference="false">mixed</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="98" package="">
-        <name>get_system_tables</name>
-        <type>function</type>
-        <docblock line="93">
-          <description><![CDATA[List system tables for the current database]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="93" name="return" description="" type="array">
-            <type by_reference="false">array</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="113" package="">
-        <name>load_database</name>
-        <type>function</type>
-        <docblock line="107">
-          <description><![CDATA[Load a database for the current connection]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="107" name="param" description="" type="string" variable="$db">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="107" name="param" description="" type="string" variable="$name">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-        <argument line="113">
-          <name>$db</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-        <argument line="113">
-          <name>$name</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="126" package="">
-        <name>unload_database</name>
-        <type>function</type>
-        <docblock line="121">
-          <description><![CDATA[Unload a database from the current connection]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="121" name="param" description="" type="string" variable="$name">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-        <argument line="126">
-          <name>$name</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="144" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="80" package="">
         <name>num_rows</name>
         <type>function</type>
-        <docblock line="139">
+        <docblock line="75">
           <description><![CDATA[Return the number of rows returned for a SELECT query]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="139" name="return" description="" type="int">
+          <tag line="75" name="return" description="" type="int">
             <type by_reference="false">int</type>
           </tag>
         </docblock>
       </method>
     </class>
   </file>
-  <file path="sys/db/drivers/sqlite/sqlite_sql.php" hash="a969bfad3f227e02f814616954582c37" package="Default">
+  <file path="sys/db/drivers/mysql/mysql_sql.php" hash="41d15ee4e1357bb84f07e71872252810" package="Query">
     <docblock line="2">
       <description><![CDATA[Query]]></description>
       <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
+      <tag line="2" name="package" description="Query"/>
       <tag line="2" name="author" description="Timothy J. Warren"/>
       <tag line="2" name="copyright" description="Copyright (c) 2012"/>
       <tag line="2" name="link" description="https://github.com/aviat4ion/Query" link="https://github.com/aviat4ion/Query"/>
       <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
     </docblock>
-    <class final="false" abstract="false" namespace="default" line="18" package="Default">
-      <name>SQLite_SQL</name>
-      <full_name>\SQLite_SQL</full_name>
+    <class final="false" abstract="false" namespace="default" line="22" package="Query\Drivers">
+      <name>MySQL_SQL</name>
+      <full_name>\MySQL_SQL</full_name>
       <extends>\DB_SQL</extends>
-      <docblock line="15">
-        <description><![CDATA[SQLite Specific SQL]]></description>
+      <docblock line="16">
+        <description><![CDATA[MySQL specifc SQL]]></description>
         <long-description><![CDATA[]]></long-description>
+        <tag line="16" name="package" description="Query"/>
+        <tag line="16" name="subpackage" description="Drivers"/>
       </docblock>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="28" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="32" package="">
         <name>limit</name>
         <type>function</type>
-        <docblock line="20">
+        <docblock line="24">
           <description><![CDATA[Limit clause]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="20" name="param" description="" type="string" variable="$sql">
+          <tag line="24" name="param" description="" type="string" variable="$sql">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="20" name="param" description="" type="int" variable="$limit">
+          <tag line="24" name="param" description="" type="int" variable="$limit">
             <type by_reference="false">int</type>
           </tag>
-          <tag line="20" name="param" description="" type="int" variable="$offset">
+          <tag line="24" name="param" description="" type="int" variable="$offset">
             <type by_reference="false">int</type>
           </tag>
-          <tag line="20" name="return" description="" type="string">
+          <tag line="24" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
-        <argument line="28">
+        <argument line="32">
           <name>$sql</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="28">
+        <argument line="32">
           <name>$limit</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="28">
+        <argument line="32">
           <name>$offset</name>
           <default><![CDATA[FALSE]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="45" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="49" package="">
         <name>random</name>
         <type>function</type>
-        <docblock line="40">
+        <docblock line="44">
           <description><![CDATA[Random ordering keyword]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="40" name="return" description="" type="string">
+          <tag line="44" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="57" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="61" package="">
         <name>db_list</name>
         <type>function</type>
-        <docblock line="52">
+        <docblock line="56">
           <description><![CDATA[Returns sql to list other databases]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="52" name="return" description="" type="FALSE">
-            <type by_reference="false">FALSE</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="69" package="">
-        <name>table_list</name>
-        <type>function</type>
-        <docblock line="64">
-          <description><![CDATA[Returns sql to list tables]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="64" name="return" description="" type="string">
+          <tag line="56" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="86" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="73" package="">
+        <name>table_list</name>
+        <type>function</type>
+        <docblock line="68">
+          <description><![CDATA[Returns sql to list tables]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="68" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="85" package="">
         <name>system_table_list</name>
         <type>function</type>
-        <docblock line="81">
-          <description><![CDATA[Overridden in SQLite class]]></description>
+        <docblock line="80">
+          <description><![CDATA[Overridden in MySQL class]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="81" name="return" description="" type="string">
+          <tag line="80" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
@@ -3896,890 +3491,1355 @@ with array_map and glob]]></description>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="112" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="110" package="">
         <name>trigger_list</name>
         <type>function</type>
-        <docblock line="107">
+        <docblock line="105">
           <description><![CDATA[Returns sql to list triggers]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="107" name="return" description="" type="FALSE">
-            <type by_reference="false">FALSE</type>
+          <tag line="105" name="return" description="" type="string">
+            <type by_reference="false">string</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="124" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="122" package="">
         <name>function_list</name>
         <type>function</type>
-        <docblock line="119">
+        <docblock line="117">
           <description><![CDATA[Return sql to list functions]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="119" name="return" description="" type="FALSE">
-            <type by_reference="false">FALSE</type>
+          <tag line="117" name="return" description="" type="string">
+            <type by_reference="false">string</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="136" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="134" package="">
         <name>procedure_list</name>
         <type>function</type>
-        <docblock line="131">
+        <docblock line="129">
           <description><![CDATA[Return sql to list stored procedures]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="131" name="return" description="" type="FALSE">
-            <type by_reference="false">FALSE</type>
+          <tag line="129" name="return" description="" type="string">
+            <type by_reference="false">string</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="148" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="146" package="">
         <name>sequence_list</name>
         <type>function</type>
-        <docblock line="143">
+        <docblock line="141">
           <description><![CDATA[Return sql to list sequences]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="143" name="return" description="" type="FALSE">
+          <tag line="141" name="return" description="" type="FALSE">
             <type by_reference="false">FALSE</type>
           </tag>
         </docblock>
       </method>
     </class>
   </file>
-  <file path="sys/db/drivers/firebird/firebird_sql.php" hash="0ad1145b6763bb39f501342323a7e1c8" package="Default">
+  <file path="sys/db/drivers/sqlite/sqlite_util.php" hash="18cd637365896dd9cf94066e517cdaa8" package="Query">
     <docblock line="2">
       <description><![CDATA[Query]]></description>
       <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
+      <tag line="2" name="package" description="Query"/>
       <tag line="2" name="author" description="Timothy J. Warren"/>
       <tag line="2" name="copyright" description="Copyright (c) 2012"/>
       <tag line="2" name="link" description="https://github.com/aviat4ion/Query" link="https://github.com/aviat4ion/Query"/>
       <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
     </docblock>
-    <class final="false" abstract="false" namespace="default" line="18" package="Default">
-      <name>Firebird_SQL</name>
-      <full_name>\Firebird_SQL</full_name>
-      <extends>\DB_SQL</extends>
-      <docblock line="15">
-        <description><![CDATA[Firebird Specific SQL]]></description>
+    <class final="false" abstract="false" namespace="default" line="22" package="Query\Drivers">
+      <name>SQLite_Util</name>
+      <full_name>\SQLite_Util</full_name>
+      <extends>\DB_Util</extends>
+      <docblock line="16">
+        <description><![CDATA[SQLite-specific backup, import and creation methods]]></description>
         <long-description><![CDATA[]]></long-description>
+        <tag line="16" name="package" description="Query"/>
+        <tag line="16" name="subpackage" description="Drivers"/>
       </docblock>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="28" package="">
-        <name>limit</name>
-        <type>function</type>
-        <docblock line="20">
-          <description><![CDATA[Limit clause]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="20" name="param" description="" type="string" variable="$sql">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="20" name="param" description="" type="int" variable="$limit">
-            <type by_reference="false">int</type>
-          </tag>
-          <tag line="20" name="param" description="" type="int" variable="$offset">
-            <type by_reference="false">int</type>
-          </tag>
-          <tag line="20" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-        <argument line="28">
-          <name>$sql</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-        <argument line="28">
-          <name>$limit</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-        <argument line="28">
-          <name>$offset</name>
-          <default><![CDATA[FALSE]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="52" package="">
-        <name>random</name>
-        <type>function</type>
-        <docblock line="47">
-          <description><![CDATA[Random ordering keyword]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="47" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="65" package="">
-        <name>db_list</name>
-        <type>function</type>
-        <docblock line="60">
-          <description><![CDATA[Returns sql to list other databases]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="60" name="return" description="" type="FALSE">
-            <type by_reference="false">FALSE</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="77" package="">
-        <name>table_list</name>
-        <type>function</type>
-        <docblock line="72">
-          <description><![CDATA[Returns sql to list tables]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="72" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="94" package="">
-        <name>system_table_list</name>
-        <type>function</type>
-        <docblock line="89">
-          <description><![CDATA[Returns sql to list system tables]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="89" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="111" package="">
-        <name>view_list</name>
-        <type>function</type>
-        <docblock line="106">
-          <description><![CDATA[Returns sql to list views]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="106" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="126" package="">
-        <name>trigger_list</name>
-        <type>function</type>
-        <docblock line="121">
-          <description><![CDATA[Returns sql to list triggers]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="121" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="141" package="">
-        <name>function_list</name>
-        <type>function</type>
-        <docblock line="136">
-          <description><![CDATA[Return sql to list functions]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="136" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="153" package="">
-        <name>procedure_list</name>
-        <type>function</type>
-        <docblock line="148">
-          <description><![CDATA[Return sql to list stored procedures]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="148" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="181" package="">
-        <name>sequence_list</name>
-        <type>function</type>
-        <docblock line="176">
-          <description><![CDATA[Return sql to list sequences]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="176" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="198" package="">
-        <name>column_list</name>
-        <type>function</type>
-        <docblock line="192">
-          <description><![CDATA[Return sql to list columns of the specified table]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="192" name="param" description="" type="string" variable="$table">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="192" name="return" description="" type="string">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-        <argument line="198">
-          <name>$table</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-      </method>
-    </class>
-  </file>
-  <file path="sys/db/drivers/firebird/firebird_result.php" hash="4e18c6bbf6d41513a6ae2c513a507fdc" package="Default">
-    <docblock line="2">
-      <description><![CDATA[Query]]></description>
-      <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
-      <tag line="2" name="author" description="Timothy J. Warren"/>
-      <tag line="2" name="copyright" description="Copyright (c) 2012"/>
-      <tag line="2" name="link" description="https://github.com/aviat4ion/Query" link="https://github.com/aviat4ion/Query"/>
-      <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
-    </docblock>
-    <class final="false" abstract="false" namespace="default" line="20" package="Default">
-      <name>Firebird_Result</name>
-      <full_name>\Firebird_Result</full_name>
-      <extends>\PDOStatement</extends>
-      <docblock line="15">
-        <description><![CDATA[Firebird result class to emulate PDOStatement Class - only implements
-data-fetching methods]]></description>
-        <long-description><![CDATA[]]></long-description>
-      </docblock>
-      <property final="false" static="false" visibility="private" line="25" package="Default">
-        <name>$statement</name>
-        <default><![CDATA[]]></default>
-        <docblock line="22">
-          <description><![CDATA[Reference to fbird resource]]></description>
-          <long-description><![CDATA[]]></long-description>
-        </docblock>
-      </property>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="33" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="30" package="">
         <name>__construct</name>
         <type>function</type>
-        <docblock line="27">
-          <description><![CDATA[Create the object by passing the resource for
-the query]]></description>
+        <docblock line="24">
+          <description><![CDATA[Save a reference to the current connection object]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="27" name="param" description="" type="resource" variable="$link">
-            <type by_reference="false">resource</type>
+          <tag line="24" name="param" description="&amp;$conn" type="object" variable="$conn">
+            <type by_reference="false">object</type>
+          </tag>
+          <tag line="24" name="return" description="" type="void">
+            <type by_reference="false">void</type>
           </tag>
         </docblock>
-        <argument line="33">
-          <name>$link</name>
+        <argument line="30">
+          <name>$conn</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="51" package="">
-        <name>bindColumn</name>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="46" package="">
+        <name>create_table</name>
         <type>function</type>
-        <docblock line="41">
-          <description><![CDATA[Invalidate method for data consistency]]></description>
+        <docblock line="37">
+          <description><![CDATA[Convenience public function to create a new table]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="41" name="param" description="" type="mixed" variable="$column">
-            <type by_reference="false">mixed</type>
-          </tag>
-          <tag line="41" name="param" description="&amp;$param" type="mixed" variable="$param">
-            <type by_reference="false">mixed</type>
-          </tag>
-          <tag line="41" name="param" description="" type="int" variable="$type">
-            <type by_reference="false">int</type>
-          </tag>
-          <tag line="41" name="param" description="" type="mixed" variable="$maxlen">
-            <type by_reference="false">mixed</type>
-          </tag>
-          <tag line="41" name="param" description="" type="array" variable="$driverdata">
-            <type by_reference="false">array</type>
-          </tag>
-          <tag line="41" name="return" description="" type="FALSE">
-            <type by_reference="false">FALSE</type>
-          </tag>
-        </docblock>
-        <argument line="51">
-          <name>$column</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-        <argument line="51">
-          <name>$param</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-        <argument line="51">
-          <name>$type</name>
-          <default><![CDATA[NULL]]></default>
-          <type/>
-        </argument>
-        <argument line="51">
-          <name>$maxlen</name>
-          <default><![CDATA[NULL]]></default>
-          <type/>
-        </argument>
-        <argument line="51">
-          <name>$driverdata</name>
-          <default><![CDATA[NULL]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="68" package="">
-        <name>bindParam</name>
-        <type>function</type>
-        <docblock line="58">
-          <description><![CDATA[Invalidate method for data consistency]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="58" name="param" description="" type="mixed" variable="$parameter">
-            <type by_reference="false">mixed</type>
-          </tag>
-          <tag line="58" name="param" description="&amp;$variable" type="mixed" variable="$variable">
-            <type by_reference="false">mixed</type>
-          </tag>
-          <tag line="58" name="param" description="" type="int" variable="$data_type">
-            <type by_reference="false">int</type>
-          </tag>
-          <tag line="58" name="param" description="" type="mixed" variable="$maxlen">
-            <type by_reference="false">mixed</type>
-          </tag>
-          <tag line="58" name="param" description="" type="array" variable="$driverdata">
-            <type by_reference="false">array</type>
-          </tag>
-          <tag line="58" name="return" description="" type="FALSE">
-            <type by_reference="false">FALSE</type>
-          </tag>
-        </docblock>
-        <argument line="68">
-          <name>$parameter</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-        <argument line="68">
-          <name>$variable</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-        <argument line="68">
-          <name>$data_type</name>
-          <default><![CDATA[NULL]]></default>
-          <type/>
-        </argument>
-        <argument line="68">
-          <name>$maxlen</name>
-          <default><![CDATA[NULL]]></default>
-          <type/>
-        </argument>
-        <argument line="68">
-          <name>$driverdata</name>
-          <default><![CDATA[NULL]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="83" package="">
-        <name>bindValue</name>
-        <type>function</type>
-        <docblock line="75">
-          <description><![CDATA[Invalidate method for data consistency]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="75" name="param" description="" type="mixed" variable="$parameter">
-            <type by_reference="false">mixed</type>
-          </tag>
-          <tag line="75" name="param" description="&amp;$variable" type="mixed" variable="$variable">
-            <type by_reference="false">mixed</type>
-          </tag>
-          <tag line="75" name="param" description="" type="int" variable="$data_type">
-            <type by_reference="false">int</type>
-          </tag>
-          <tag line="75" name="return" description="" type="FALSE">
-            <type by_reference="false">FALSE</type>
-          </tag>
-        </docblock>
-        <argument line="83">
-          <name>$parameter</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-        <argument line="83">
-          <name>$variable</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-        <argument line="83">
-          <name>$data_type</name>
-          <default><![CDATA[NULL]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="96" package="">
-        <name>execute</name>
-        <type>function</type>
-        <docblock line="90">
-          <description><![CDATA[Run a prepared statement query]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="90" name="param" description="" type="array" variable="$args">
-            <type by_reference="false">array</type>
-          </tag>
-          <tag line="90" name="return" description="" type="bool">
-            <type by_reference="false">bool</type>
-          </tag>
-        </docblock>
-        <argument line="96">
-          <name>$args</name>
-          <default><![CDATA[NULL]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="119" package="">
-        <name>fetch</name>
-        <type>function</type>
-        <docblock line="111">
-          <description><![CDATA[Emulate PDO fetch public function]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="111" name="param" description="" type="int" variable="$fetch_style">
-            <type by_reference="false">int</type>
-          </tag>
-          <tag line="111" name="param" description="" type="mixed" variable="$statement">
-            <type by_reference="false">mixed</type>
-          </tag>
-          <tag line="111" name="param" description="" type="mixed" variable="$offset">
-            <type by_reference="false">mixed</type>
-          </tag>
-          <tag line="111" name="return" description="" type="mixed">
-            <type by_reference="false">mixed</type>
-          </tag>
-        </docblock>
-        <argument line="119">
-          <name>$fetch_style</name>
-          <default><![CDATA[PDO::FETCH_ASSOC]]></default>
-          <type/>
-        </argument>
-        <argument line="119">
-          <name>$statement</name>
-          <default><![CDATA[NULL]]></default>
-          <type/>
-        </argument>
-        <argument line="119">
-          <name>$offset</name>
-          <default><![CDATA[NULL]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="152" package="">
-        <name>fetchAll</name>
-        <type>function</type>
-        <docblock line="144">
-          <description><![CDATA[Emulate PDO fetchAll public function]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="144" name="param" description="" type="int" variable="$fetch_style">
-            <type by_reference="false">int</type>
-          </tag>
-          <tag line="144" name="param" description="" type="mixed" variable="$statement">
-            <type by_reference="false">mixed</type>
-          </tag>
-          <tag line="144" name="param" description="" type="mixed" variable="$ctor_args">
-            <type by_reference="false">mixed</type>
-          </tag>
-          <tag line="144" name="return" description="" type="mixed">
-            <type by_reference="false">mixed</type>
-          </tag>
-        </docblock>
-        <argument line="152">
-          <name>$fetch_style</name>
-          <default><![CDATA[PDO::FETCH_ASSOC]]></default>
-          <type/>
-        </argument>
-        <argument line="152">
-          <name>$statement</name>
-          <default><![CDATA[NULL]]></default>
-          <type/>
-        </argument>
-        <argument line="152">
-          <name>$ctor_args</name>
-          <default><![CDATA[NULL]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="174" package="">
-        <name>fetchColumn</name>
-        <type>function</type>
-        <docblock line="168">
-          <description><![CDATA[Emulate PDOStatement::fetchColumn]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="168" name="param" description="" type="int" variable="$column_num">
-            <type by_reference="false">int</type>
-          </tag>
-          <tag line="168" name="return" description="" type="mixed">
-            <type by_reference="false">mixed</type>
-          </tag>
-        </docblock>
-        <argument line="174">
-          <name>$column_num</name>
-          <default><![CDATA[0]]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="189" package="">
-        <name>fetchObject</name>
-        <type>function</type>
-        <docblock line="182">
-          <description><![CDATA[Emulate PDOStatement::fetchObject, but only for the default use]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="182" name="param" description="" type="string" variable="$class_name">
+          <tag line="37" name="param" description="//Name of the table" type="string" variable="$name">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="182" name="param" description="" type="array" variable="$ctor_args">
+          <tag line="37" name="param" description="//columns as straight array and/or column =&gt; type pairs" type="array" variable="$columns">
             <type by_reference="false">array</type>
           </tag>
-          <tag line="182" name="return" description="" type="mixed">
-            <type by_reference="false">mixed</type>
+          <tag line="37" name="param" description="// column =&gt; constraint pairs" type="array" variable="$constraints">
+            <type by_reference="false">array</type>
+          </tag>
+          <tag line="37" name="param" description="// column =&gt; index pairs" type="array" variable="$indexes">
+            <type by_reference="false">array</type>
+          </tag>
+          <tag line="37" name="return" description="" type="string">
+            <type by_reference="false">string</type>
           </tag>
         </docblock>
-        <argument line="189">
-          <name>$class_name</name>
-          <default><![CDATA['stdClass']]></default>
+        <argument line="46">
+          <name>$name</name>
+          <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="189">
-          <name>$ctor_args</name>
+        <argument line="46">
+          <name>$columns</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+        <argument line="46">
+          <name>$constraints</name>
           <default><![CDATA[array()]]></default>
-          <type/>
+          <type>array</type>
+        </argument>
+        <argument line="46">
+          <name>$indexes</name>
+          <default><![CDATA[array()]]></default>
+          <type>array</type>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="201" package="">
-        <name>rowCount</name>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="102" package="">
+        <name>delete_table</name>
         <type>function</type>
-        <docblock line="196">
-          <description><![CDATA[Return the number of rows affected by the previous query]]></description>
+        <docblock line="96">
+          <description><![CDATA[SQL to drop the specified table]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="196" name="return" description="" type="int">
-            <type by_reference="false">int</type>
+          <tag line="96" name="param" description="" type="string" variable="$name">
+            <type by_reference="false">string</type>
           </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="213" package="">
-        <name>num_rows</name>
-        <type>function</type>
-        <docblock line="208">
-          <description><![CDATA[Return the number of rows for the select query]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="208" name="return" description="" type="int">
-            <type by_reference="false">int</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="225" package="">
-        <name>errorCode</name>
-        <type>function</type>
-        <docblock line="220">
-          <description><![CDATA[Method to emulate PDOStatement->errorCode]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="220" name="return" description="" type="string">
+          <tag line="96" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="237" package="">
-        <name>errorInfo</name>
-        <type>function</type>
-        <docblock line="232">
-          <description><![CDATA[Method to emulate PDO->errorInfo / PDOStatement->errorInfo]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="232" name="return" description="" type="array">
-            <type by_reference="false">array</type>
-          </tag>
-        </docblock>
-      </method>
-    </class>
-  </file>
-  <file path="sys/db/drivers/firebird/firebird_driver.php" hash="726964c655286fd7cfef3a16e1514145" package="Default">
-    <docblock line="2">
-      <description><![CDATA[Query]]></description>
-      <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
-      <tag line="2" name="author" description="Timothy J. Warren"/>
-      <tag line="2" name="copyright" description="Copyright (c) 2012"/>
-      <tag line="2" name="link" description="https://github.com/aviat4ion/Query" link="https://github.com/aviat4ion/Query"/>
-      <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
-    </docblock>
-    <class final="false" abstract="false" namespace="default" line="20" package="Default">
-      <name>Firebird</name>
-      <full_name>\Firebird</full_name>
-      <extends>\DB_PDO</extends>
-      <docblock line="15">
-        <description><![CDATA[Firebird Database class]]></description>
-        <long-description><![CDATA[<p>PDO-firebird isn't stable, so this is a wrapper of the fbird_ public functions.</p>]]></long-description>
-      </docblock>
-      <property final="false" static="false" visibility="protected" line="25" package="Default">
-        <name>$statement</name>
-        <default><![CDATA[]]></default>
-        <docblock line="22">
-          <description><![CDATA[Reference to the last query executed]]></description>
-          <long-description><![CDATA[]]></long-description>
-        </docblock>
-      </property>
-      <property final="false" static="false" visibility="protected" line="31" package="Default">
-        <name>$statement_link</name>
-        <default><![CDATA[]]></default>
-        <docblock line="27">
-          <description><![CDATA[Reference to the resource returned by
-the last query executed]]></description>
-          <long-description><![CDATA[]]></long-description>
-        </docblock>
-      </property>
-      <property final="false" static="false" visibility="protected" line="36" package="Default">
-        <name>$trans</name>
-        <default><![CDATA[]]></default>
-        <docblock line="33">
-          <description><![CDATA[Reference to the current transaction]]></description>
-          <long-description><![CDATA[]]></long-description>
-        </docblock>
-      </property>
-      <property final="false" static="false" visibility="protected" line="41" package="Default">
-        <name>$conn</name>
-        <default><![CDATA[]]></default>
-        <docblock line="38">
-          <description><![CDATA[Reference to the connection resource]]></description>
-          <long-description><![CDATA[]]></long-description>
-        </docblock>
-      </property>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="50" package="">
-        <name>__construct</name>
-        <type>function</type>
-        <docblock line="43">
-          <description><![CDATA[Open the link to the database]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="43" name="param" description="" type="string" variable="$dbpath">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="43" name="param" description="" type="string" variable="$user">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="43" name="param" description="" type="string" variable="$pass">
-            <type by_reference="false">string</type>
-          </tag>
-        </docblock>
-        <argument line="50">
-          <name>$dbpath</name>
-          <default><![CDATA[]]></default>
-          <type/>
-        </argument>
-        <argument line="50">
-          <name>$user</name>
-          <default><![CDATA['sysdba']]></default>
-          <type/>
-        </argument>
-        <argument line="50">
-          <name>$pass</name>
-          <default><![CDATA['masterkey']]></default>
-          <type/>
-        </argument>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="83" package="">
-        <name>switch_db</name>
-        <type>function</type>
-        <docblock line="77">
-          <description><![CDATA[Doesn't apply to Firebird]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="77" name="param" description="" type="string" variable="$name">
-            <type by_reference="false">string</type>
-          </tag>
-          <tag line="77" name="return" description="" type="FALSE">
-            <type by_reference="false">FALSE</type>
-          </tag>
-        </docblock>
-        <argument line="83">
+        <argument line="102">
           <name>$name</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="95" package="">
-        <name>truncate</name>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="115" package="">
+        <name>backup_data</name>
         <type>function</type>
-        <docblock line="90">
-          <description><![CDATA[Empty a database table]]></description>
+        <docblock line="109">
+          <description><![CDATA[Create an SQL backup file for the current database's data]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="90" name="param" description="" type="string" variable="$table">
+          <tag line="109" name="param" description="" type="array" variable="$excluded">
+            <type by_reference="false">array</type>
+          </tag>
+          <tag line="109" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
-        <argument line="95">
+        <argument line="115">
+          <name>$excluded</name>
+          <default><![CDATA[array()]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="179" package="">
+        <name>backup_structure</name>
+        <type>function</type>
+        <docblock line="174">
+          <description><![CDATA[Create an SQL backup file for the current database's structure]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="174" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+      </method>
+    </class>
+  </file>
+  <file path="sys/db/drivers/sqlite/sqlite_driver.php" hash="5f0f579f396c2dcce2f6165111279129" package="Query">
+    <docblock line="2">
+      <description><![CDATA[Query]]></description>
+      <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
+      <tag line="2" name="package" description="Query"/>
+      <tag line="2" name="author" description="Timothy J. Warren"/>
+      <tag line="2" name="copyright" description="Copyright (c) 2012"/>
+      <tag line="2" name="link" description="https://github.com/aviat4ion/Query" link="https://github.com/aviat4ion/Query"/>
+      <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
+    </docblock>
+    <class final="false" abstract="false" namespace="default" line="22" package="Query\Drivers">
+      <name>SQLite</name>
+      <full_name>\SQLite</full_name>
+      <extends>\DB_PDO</extends>
+      <docblock line="16">
+        <description><![CDATA[SQLite specific class]]></description>
+        <long-description><![CDATA[]]></long-description>
+        <tag line="16" name="package" description="Query"/>
+        <tag line="16" name="subpackage" description="Drivers"/>
+      </docblock>
+      <property final="false" static="false" visibility="protected" line="27" package="Default">
+        <name>$statement</name>
+        <default><![CDATA[]]></default>
+        <docblock line="24">
+          <description><![CDATA[Reference to the last executed sql query]]></description>
+          <long-description><![CDATA[]]></long-description>
+        </docblock>
+      </property>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="36" package="">
+        <name>__construct</name>
+        <type>function</type>
+        <docblock line="29">
+          <description><![CDATA[Open SQLite Database]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="29" name="param" description="" type="string" variable="$dsn">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="29" name="param" description="" type="string" variable="$user">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="29" name="param" description="" type="string" variable="$pass">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+        <argument line="36">
+          <name>$dsn</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+        <argument line="36">
+          <name>$user</name>
+          <default><![CDATA[NULL]]></default>
+          <type/>
+        </argument>
+        <argument line="36">
+          <name>$pass</name>
+          <default><![CDATA[NULL]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="49" package="">
+        <name>switch_db</name>
+        <type>function</type>
+        <docblock line="44">
+          <description><![CDATA[Doesn't apply to sqlite]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="44" name="param" description="" type="string" variable="$name">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+        <argument line="49">
+          <name>$name</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="61" package="">
+        <name>truncate</name>
+        <type>function</type>
+        <docblock line="56">
+          <description><![CDATA[Empty a table]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="56" name="param" description="" type="string" variable="$table">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+        <argument line="61">
           <name>$table</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="110" package="">
-        <name>query</name>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="79" package="">
+        <name>get_tables</name>
         <type>function</type>
-        <docblock line="104">
-          <description><![CDATA[Wrapper public function to better match PDO]]></description>
+        <docblock line="74">
+          <description><![CDATA[List tables for the current database]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="104" name="param" description="" type="string" variable="$sql">
+          <tag line="74" name="return" description="" type="mixed">
+            <type by_reference="false">mixed</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="100" package="">
+        <name>get_system_tables</name>
+        <type>function</type>
+        <docblock line="95">
+          <description><![CDATA[List system tables for the current database]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="95" name="return" description="" type="array">
+            <type by_reference="false">array</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="115" package="">
+        <name>load_database</name>
+        <type>function</type>
+        <docblock line="109">
+          <description><![CDATA[Load a database for the current connection]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="109" name="param" description="" type="string" variable="$db">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="104" name="return" description="" type="\$this">
+          <tag line="109" name="param" description="" type="string" variable="$name">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+        <argument line="115">
+          <name>$db</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+        <argument line="115">
+          <name>$name</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="128" package="">
+        <name>unload_database</name>
+        <type>function</type>
+        <docblock line="123">
+          <description><![CDATA[Unload a database from the current connection]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="123" name="param" description="" type="string" variable="$name">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+        <argument line="128">
+          <name>$name</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="146" package="">
+        <name>num_rows</name>
+        <type>function</type>
+        <docblock line="141">
+          <description><![CDATA[Return the number of rows returned for a SELECT query]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="141" name="return" description="" type="int">
+            <type by_reference="false">int</type>
+          </tag>
+        </docblock>
+      </method>
+    </class>
+  </file>
+  <file path="sys/db/drivers/sqlite/sqlite_sql.php" hash="922f241976864c2452c65c2ebec32eda" package="Query">
+    <docblock line="2">
+      <description><![CDATA[Query]]></description>
+      <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
+      <tag line="2" name="package" description="Query"/>
+      <tag line="2" name="author" description="Timothy J. Warren"/>
+      <tag line="2" name="copyright" description="Copyright (c) 2012"/>
+      <tag line="2" name="link" description="https://github.com/aviat4ion/Query" link="https://github.com/aviat4ion/Query"/>
+      <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
+    </docblock>
+    <class final="false" abstract="false" namespace="default" line="22" package="Query\Drivers">
+      <name>SQLite_SQL</name>
+      <full_name>\SQLite_SQL</full_name>
+      <extends>\DB_SQL</extends>
+      <docblock line="16">
+        <description><![CDATA[SQLite Specific SQL]]></description>
+        <long-description><![CDATA[]]></long-description>
+        <tag line="16" name="package" description="Query"/>
+        <tag line="16" name="subpackage" description="Drivers"/>
+      </docblock>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="32" package="">
+        <name>limit</name>
+        <type>function</type>
+        <docblock line="24">
+          <description><![CDATA[Limit clause]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="24" name="param" description="" type="string" variable="$sql">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="24" name="param" description="" type="int" variable="$limit">
+            <type by_reference="false">int</type>
+          </tag>
+          <tag line="24" name="param" description="" type="int" variable="$offset">
+            <type by_reference="false">int</type>
+          </tag>
+          <tag line="24" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+        <argument line="32">
+          <name>$sql</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+        <argument line="32">
+          <name>$limit</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+        <argument line="32">
+          <name>$offset</name>
+          <default><![CDATA[FALSE]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="49" package="">
+        <name>random</name>
+        <type>function</type>
+        <docblock line="44">
+          <description><![CDATA[Random ordering keyword]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="44" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="61" package="">
+        <name>db_list</name>
+        <type>function</type>
+        <docblock line="56">
+          <description><![CDATA[Returns sql to list other databases]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="56" name="return" description="" type="FALSE">
+            <type by_reference="false">FALSE</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="73" package="">
+        <name>table_list</name>
+        <type>function</type>
+        <docblock line="68">
+          <description><![CDATA[Returns sql to list tables]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="68" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="90" package="">
+        <name>system_table_list</name>
+        <type>function</type>
+        <docblock line="85">
+          <description><![CDATA[Overridden in SQLite class]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="85" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="102" package="">
+        <name>view_list</name>
+        <type>function</type>
+        <docblock line="97">
+          <description><![CDATA[Returns sql to list views]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="97" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="116" package="">
+        <name>trigger_list</name>
+        <type>function</type>
+        <docblock line="111">
+          <description><![CDATA[Returns sql to list triggers]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="111" name="return" description="" type="FALSE">
+            <type by_reference="false">FALSE</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="128" package="">
+        <name>function_list</name>
+        <type>function</type>
+        <docblock line="123">
+          <description><![CDATA[Return sql to list functions]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="123" name="return" description="" type="FALSE">
+            <type by_reference="false">FALSE</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="140" package="">
+        <name>procedure_list</name>
+        <type>function</type>
+        <docblock line="135">
+          <description><![CDATA[Return sql to list stored procedures]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="135" name="return" description="" type="FALSE">
+            <type by_reference="false">FALSE</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="152" package="">
+        <name>sequence_list</name>
+        <type>function</type>
+        <docblock line="147">
+          <description><![CDATA[Return sql to list sequences]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="147" name="return" description="" type="FALSE">
+            <type by_reference="false">FALSE</type>
+          </tag>
+        </docblock>
+      </method>
+    </class>
+  </file>
+  <file path="sys/db/drivers/firebird/firebird_sql.php" hash="1691368f9f3d42296b89c1e5e33281e0" package="Query">
+    <docblock line="2">
+      <description><![CDATA[Query]]></description>
+      <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
+      <tag line="2" name="package" description="Query"/>
+      <tag line="2" name="author" description="Timothy J. Warren"/>
+      <tag line="2" name="copyright" description="Copyright (c) 2012"/>
+      <tag line="2" name="link" description="https://github.com/aviat4ion/Query" link="https://github.com/aviat4ion/Query"/>
+      <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
+    </docblock>
+    <class final="false" abstract="false" namespace="default" line="22" package="Query\Drivers">
+      <name>Firebird_SQL</name>
+      <full_name>\Firebird_SQL</full_name>
+      <extends>\DB_SQL</extends>
+      <docblock line="16">
+        <description><![CDATA[Firebird Specific SQL]]></description>
+        <long-description><![CDATA[]]></long-description>
+        <tag line="16" name="package" description="Query"/>
+        <tag line="16" name="subpackage" description="Drivers"/>
+      </docblock>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="32" package="">
+        <name>limit</name>
+        <type>function</type>
+        <docblock line="24">
+          <description><![CDATA[Limit clause]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="24" name="param" description="" type="string" variable="$sql">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="24" name="param" description="" type="int" variable="$limit">
+            <type by_reference="false">int</type>
+          </tag>
+          <tag line="24" name="param" description="" type="int" variable="$offset">
+            <type by_reference="false">int</type>
+          </tag>
+          <tag line="24" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+        <argument line="32">
+          <name>$sql</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+        <argument line="32">
+          <name>$limit</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+        <argument line="32">
+          <name>$offset</name>
+          <default><![CDATA[FALSE]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="56" package="">
+        <name>random</name>
+        <type>function</type>
+        <docblock line="51">
+          <description><![CDATA[Random ordering keyword]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="51" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="69" package="">
+        <name>db_list</name>
+        <type>function</type>
+        <docblock line="64">
+          <description><![CDATA[Returns sql to list other databases]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="64" name="return" description="" type="FALSE">
+            <type by_reference="false">FALSE</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="81" package="">
+        <name>table_list</name>
+        <type>function</type>
+        <docblock line="76">
+          <description><![CDATA[Returns sql to list tables]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="76" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="98" package="">
+        <name>system_table_list</name>
+        <type>function</type>
+        <docblock line="93">
+          <description><![CDATA[Returns sql to list system tables]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="93" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="115" package="">
+        <name>view_list</name>
+        <type>function</type>
+        <docblock line="110">
+          <description><![CDATA[Returns sql to list views]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="110" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="130" package="">
+        <name>trigger_list</name>
+        <type>function</type>
+        <docblock line="125">
+          <description><![CDATA[Returns sql to list triggers]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="125" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="145" package="">
+        <name>function_list</name>
+        <type>function</type>
+        <docblock line="140">
+          <description><![CDATA[Return sql to list functions]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="140" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="157" package="">
+        <name>procedure_list</name>
+        <type>function</type>
+        <docblock line="152">
+          <description><![CDATA[Return sql to list stored procedures]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="152" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="185" package="">
+        <name>sequence_list</name>
+        <type>function</type>
+        <docblock line="180">
+          <description><![CDATA[Return sql to list sequences]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="180" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="202" package="">
+        <name>column_list</name>
+        <type>function</type>
+        <docblock line="196">
+          <description><![CDATA[Return sql to list columns of the specified table]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="196" name="param" description="" type="string" variable="$table">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="196" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+        <argument line="202">
+          <name>$table</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+      </method>
+    </class>
+  </file>
+  <file path="sys/db/drivers/firebird/firebird_result.php" hash="3a502465d028cdeb58a2b7722c3af66c" package="Query">
+    <docblock line="2">
+      <description><![CDATA[Query]]></description>
+      <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
+      <tag line="2" name="package" description="Query"/>
+      <tag line="2" name="author" description="Timothy J. Warren"/>
+      <tag line="2" name="copyright" description="Copyright (c) 2012"/>
+      <tag line="2" name="link" description="https://github.com/aviat4ion/Query" link="https://github.com/aviat4ion/Query"/>
+      <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
+    </docblock>
+    <class final="false" abstract="false" namespace="default" line="23" package="Query\Drivers">
+      <name>Firebird_Result</name>
+      <full_name>\Firebird_Result</full_name>
+      <extends>\PDOStatement</extends>
+      <docblock line="16">
+        <description><![CDATA[Firebird result class to emulate PDOStatement Class - only implements
+data-fetching methods]]></description>
+        <long-description><![CDATA[]]></long-description>
+        <tag line="16" name="package" description="Query"/>
+        <tag line="16" name="subpackage" description="Drivers"/>
+      </docblock>
+      <property final="false" static="false" visibility="private" line="28" package="Default">
+        <name>$statement</name>
+        <default><![CDATA[]]></default>
+        <docblock line="25">
+          <description><![CDATA[Reference to fbird resource]]></description>
+          <long-description><![CDATA[]]></long-description>
+        </docblock>
+      </property>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="36" package="">
+        <name>__construct</name>
+        <type>function</type>
+        <docblock line="30">
+          <description><![CDATA[Create the object by passing the resource for
+the query]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="30" name="param" description="" type="resource" variable="$link">
+            <type by_reference="false">resource</type>
+          </tag>
+        </docblock>
+        <argument line="36">
+          <name>$link</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="54" package="">
+        <name>bindColumn</name>
+        <type>function</type>
+        <docblock line="44">
+          <description><![CDATA[Invalidate method for data consistency]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="44" name="param" description="" type="mixed" variable="$column">
+            <type by_reference="false">mixed</type>
+          </tag>
+          <tag line="44" name="param" description="&amp;$param" type="mixed" variable="$param">
+            <type by_reference="false">mixed</type>
+          </tag>
+          <tag line="44" name="param" description="" type="int" variable="$type">
+            <type by_reference="false">int</type>
+          </tag>
+          <tag line="44" name="param" description="" type="mixed" variable="$maxlen">
+            <type by_reference="false">mixed</type>
+          </tag>
+          <tag line="44" name="param" description="" type="array" variable="$driverdata">
+            <type by_reference="false">array</type>
+          </tag>
+          <tag line="44" name="return" description="" type="FALSE">
+            <type by_reference="false">FALSE</type>
+          </tag>
+        </docblock>
+        <argument line="54">
+          <name>$column</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+        <argument line="54">
+          <name>$param</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+        <argument line="54">
+          <name>$type</name>
+          <default><![CDATA[NULL]]></default>
+          <type/>
+        </argument>
+        <argument line="54">
+          <name>$maxlen</name>
+          <default><![CDATA[NULL]]></default>
+          <type/>
+        </argument>
+        <argument line="54">
+          <name>$driverdata</name>
+          <default><![CDATA[NULL]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="71" package="">
+        <name>bindParam</name>
+        <type>function</type>
+        <docblock line="61">
+          <description><![CDATA[Invalidate method for data consistency]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="61" name="param" description="" type="mixed" variable="$parameter">
+            <type by_reference="false">mixed</type>
+          </tag>
+          <tag line="61" name="param" description="&amp;$variable" type="mixed" variable="$variable">
+            <type by_reference="false">mixed</type>
+          </tag>
+          <tag line="61" name="param" description="" type="int" variable="$data_type">
+            <type by_reference="false">int</type>
+          </tag>
+          <tag line="61" name="param" description="" type="mixed" variable="$maxlen">
+            <type by_reference="false">mixed</type>
+          </tag>
+          <tag line="61" name="param" description="" type="array" variable="$driverdata">
+            <type by_reference="false">array</type>
+          </tag>
+          <tag line="61" name="return" description="" type="FALSE">
+            <type by_reference="false">FALSE</type>
+          </tag>
+        </docblock>
+        <argument line="71">
+          <name>$parameter</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+        <argument line="71">
+          <name>$variable</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+        <argument line="71">
+          <name>$data_type</name>
+          <default><![CDATA[NULL]]></default>
+          <type/>
+        </argument>
+        <argument line="71">
+          <name>$maxlen</name>
+          <default><![CDATA[NULL]]></default>
+          <type/>
+        </argument>
+        <argument line="71">
+          <name>$driverdata</name>
+          <default><![CDATA[NULL]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="86" package="">
+        <name>bindValue</name>
+        <type>function</type>
+        <docblock line="78">
+          <description><![CDATA[Invalidate method for data consistency]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="78" name="param" description="" type="mixed" variable="$parameter">
+            <type by_reference="false">mixed</type>
+          </tag>
+          <tag line="78" name="param" description="&amp;$variable" type="mixed" variable="$variable">
+            <type by_reference="false">mixed</type>
+          </tag>
+          <tag line="78" name="param" description="" type="int" variable="$data_type">
+            <type by_reference="false">int</type>
+          </tag>
+          <tag line="78" name="return" description="" type="FALSE">
+            <type by_reference="false">FALSE</type>
+          </tag>
+        </docblock>
+        <argument line="86">
+          <name>$parameter</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+        <argument line="86">
+          <name>$variable</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+        <argument line="86">
+          <name>$data_type</name>
+          <default><![CDATA[NULL]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="99" package="">
+        <name>execute</name>
+        <type>function</type>
+        <docblock line="93">
+          <description><![CDATA[Run a prepared statement query]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="93" name="param" description="" type="array" variable="$args">
+            <type by_reference="false">array</type>
+          </tag>
+          <tag line="93" name="return" description="" type="bool">
+            <type by_reference="false">bool</type>
+          </tag>
+        </docblock>
+        <argument line="99">
+          <name>$args</name>
+          <default><![CDATA[NULL]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="122" package="">
+        <name>fetch</name>
+        <type>function</type>
+        <docblock line="114">
+          <description><![CDATA[Emulate PDO fetch public function]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="114" name="param" description="" type="int" variable="$fetch_style">
+            <type by_reference="false">int</type>
+          </tag>
+          <tag line="114" name="param" description="" type="mixed" variable="$statement">
+            <type by_reference="false">mixed</type>
+          </tag>
+          <tag line="114" name="param" description="" type="mixed" variable="$offset">
+            <type by_reference="false">mixed</type>
+          </tag>
+          <tag line="114" name="return" description="" type="mixed">
+            <type by_reference="false">mixed</type>
+          </tag>
+        </docblock>
+        <argument line="122">
+          <name>$fetch_style</name>
+          <default><![CDATA[PDO::FETCH_ASSOC]]></default>
+          <type/>
+        </argument>
+        <argument line="122">
+          <name>$statement</name>
+          <default><![CDATA[NULL]]></default>
+          <type/>
+        </argument>
+        <argument line="122">
+          <name>$offset</name>
+          <default><![CDATA[NULL]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="155" package="">
+        <name>fetchAll</name>
+        <type>function</type>
+        <docblock line="147">
+          <description><![CDATA[Emulate PDO fetchAll public function]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="147" name="param" description="" type="int" variable="$fetch_style">
+            <type by_reference="false">int</type>
+          </tag>
+          <tag line="147" name="param" description="" type="mixed" variable="$statement">
+            <type by_reference="false">mixed</type>
+          </tag>
+          <tag line="147" name="param" description="" type="mixed" variable="$ctor_args">
+            <type by_reference="false">mixed</type>
+          </tag>
+          <tag line="147" name="return" description="" type="mixed">
+            <type by_reference="false">mixed</type>
+          </tag>
+        </docblock>
+        <argument line="155">
+          <name>$fetch_style</name>
+          <default><![CDATA[PDO::FETCH_ASSOC]]></default>
+          <type/>
+        </argument>
+        <argument line="155">
+          <name>$statement</name>
+          <default><![CDATA[NULL]]></default>
+          <type/>
+        </argument>
+        <argument line="155">
+          <name>$ctor_args</name>
+          <default><![CDATA[NULL]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="177" package="">
+        <name>fetchColumn</name>
+        <type>function</type>
+        <docblock line="171">
+          <description><![CDATA[Emulate PDOStatement::fetchColumn]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="171" name="param" description="" type="int" variable="$column_num">
+            <type by_reference="false">int</type>
+          </tag>
+          <tag line="171" name="return" description="" type="mixed">
+            <type by_reference="false">mixed</type>
+          </tag>
+        </docblock>
+        <argument line="177">
+          <name>$column_num</name>
+          <default><![CDATA[0]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="192" package="">
+        <name>fetchObject</name>
+        <type>function</type>
+        <docblock line="185">
+          <description><![CDATA[Emulate PDOStatement::fetchObject, but only for the default use]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="185" name="param" description="" type="string" variable="$class_name">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="185" name="param" description="" type="array" variable="$ctor_args">
+            <type by_reference="false">array</type>
+          </tag>
+          <tag line="185" name="return" description="" type="mixed">
+            <type by_reference="false">mixed</type>
+          </tag>
+        </docblock>
+        <argument line="192">
+          <name>$class_name</name>
+          <default><![CDATA['stdClass']]></default>
+          <type/>
+        </argument>
+        <argument line="192">
+          <name>$ctor_args</name>
+          <default><![CDATA[array()]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="204" package="">
+        <name>rowCount</name>
+        <type>function</type>
+        <docblock line="199">
+          <description><![CDATA[Return the number of rows affected by the previous query]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="199" name="return" description="" type="int">
+            <type by_reference="false">int</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="216" package="">
+        <name>num_rows</name>
+        <type>function</type>
+        <docblock line="211">
+          <description><![CDATA[Return the number of rows for the select query]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="211" name="return" description="" type="int">
+            <type by_reference="false">int</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="228" package="">
+        <name>errorCode</name>
+        <type>function</type>
+        <docblock line="223">
+          <description><![CDATA[Method to emulate PDOStatement->errorCode]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="223" name="return" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="240" package="">
+        <name>errorInfo</name>
+        <type>function</type>
+        <docblock line="235">
+          <description><![CDATA[Method to emulate PDO->errorInfo / PDOStatement->errorInfo]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="235" name="return" description="" type="array">
+            <type by_reference="false">array</type>
+          </tag>
+        </docblock>
+      </method>
+    </class>
+  </file>
+  <file path="sys/db/drivers/firebird/firebird_driver.php" hash="74d454b1d64da892fad7ac87ec2491f5" package="Query">
+    <docblock line="2">
+      <description><![CDATA[Query]]></description>
+      <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
+      <tag line="2" name="package" description="Query"/>
+      <tag line="2" name="author" description="Timothy J. Warren"/>
+      <tag line="2" name="copyright" description="Copyright (c) 2012"/>
+      <tag line="2" name="link" description="https://github.com/aviat4ion/Query" link="https://github.com/aviat4ion/Query"/>
+      <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
+    </docblock>
+    <class final="false" abstract="false" namespace="default" line="24" package="Query\Drivers">
+      <name>Firebird</name>
+      <full_name>\Firebird</full_name>
+      <extends>\DB_PDO</extends>
+      <docblock line="16">
+        <description><![CDATA[Firebird Database class]]></description>
+        <long-description><![CDATA[<p>PDO-firebird isn't stable, so this is a wrapper of the fbird_ public functions.</p>]]></long-description>
+        <tag line="16" name="package" description="Query"/>
+        <tag line="16" name="subpackage" description="Drivers"/>
+      </docblock>
+      <property final="false" static="false" visibility="protected" line="29" package="Default">
+        <name>$statement</name>
+        <default><![CDATA[]]></default>
+        <docblock line="26">
+          <description><![CDATA[Reference to the last query executed]]></description>
+          <long-description><![CDATA[]]></long-description>
+        </docblock>
+      </property>
+      <property final="false" static="false" visibility="protected" line="35" package="Default">
+        <name>$statement_link</name>
+        <default><![CDATA[]]></default>
+        <docblock line="31">
+          <description><![CDATA[Reference to the resource returned by
+the last query executed]]></description>
+          <long-description><![CDATA[]]></long-description>
+        </docblock>
+      </property>
+      <property final="false" static="false" visibility="protected" line="40" package="Default">
+        <name>$trans</name>
+        <default><![CDATA[]]></default>
+        <docblock line="37">
+          <description><![CDATA[Reference to the current transaction]]></description>
+          <long-description><![CDATA[]]></long-description>
+        </docblock>
+      </property>
+      <property final="false" static="false" visibility="protected" line="45" package="Default">
+        <name>$conn</name>
+        <default><![CDATA[]]></default>
+        <docblock line="42">
+          <description><![CDATA[Reference to the connection resource]]></description>
+          <long-description><![CDATA[]]></long-description>
+        </docblock>
+      </property>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="54" package="">
+        <name>__construct</name>
+        <type>function</type>
+        <docblock line="47">
+          <description><![CDATA[Open the link to the database]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="47" name="param" description="" type="string" variable="$dbpath">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="47" name="param" description="" type="string" variable="$user">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="47" name="param" description="" type="string" variable="$pass">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+        <argument line="54">
+          <name>$dbpath</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+        <argument line="54">
+          <name>$user</name>
+          <default><![CDATA['sysdba']]></default>
+          <type/>
+        </argument>
+        <argument line="54">
+          <name>$pass</name>
+          <default><![CDATA['masterkey']]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="87" package="">
+        <name>switch_db</name>
+        <type>function</type>
+        <docblock line="81">
+          <description><![CDATA[Doesn't apply to Firebird]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="81" name="param" description="" type="string" variable="$name">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="81" name="return" description="" type="FALSE">
+            <type by_reference="false">FALSE</type>
+          </tag>
+        </docblock>
+        <argument line="87">
+          <name>$name</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="99" package="">
+        <name>truncate</name>
+        <type>function</type>
+        <docblock line="94">
+          <description><![CDATA[Empty a database table]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="94" name="param" description="" type="string" variable="$table">
+            <type by_reference="false">string</type>
+          </tag>
+        </docblock>
+        <argument line="99">
+          <name>$table</name>
+          <default><![CDATA[]]></default>
+          <type/>
+        </argument>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="114" package="">
+        <name>query</name>
+        <type>function</type>
+        <docblock line="108">
+          <description><![CDATA[Wrapper public function to better match PDO]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="108" name="param" description="" type="string" variable="$sql">
+            <type by_reference="false">string</type>
+          </tag>
+          <tag line="108" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="110">
+        <argument line="114">
           <name>$sql</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="134" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="138" package="">
         <name>prepare</name>
         <type>function</type>
-        <docblock line="127">
+        <docblock line="131">
           <description><![CDATA[Emulate PDO prepare]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="127" name="param" description="" type="string" variable="$query">
+          <tag line="131" name="param" description="" type="string" variable="$query">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="127" name="param" description="" type="array" variable="$options">
+          <tag line="131" name="param" description="" type="array" variable="$options">
             <type by_reference="false">array</type>
           </tag>
-          <tag line="127" name="return" description="" type="\$this">
+          <tag line="131" name="return" description="" type="\$this">
             <type by_reference="false">\$this</type>
           </tag>
         </docblock>
-        <argument line="134">
+        <argument line="138">
           <name>$query</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="134">
+        <argument line="138">
           <name>$options</name>
           <default><![CDATA[NULL]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="154" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="158" package="">
         <name>num_rows</name>
         <type>function</type>
-        <docblock line="149">
+        <docblock line="153">
           <description><![CDATA[Return the number of rows returned for a SELECT query]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="149" name="return" description="" type="int">
+          <tag line="153" name="return" description="" type="int">
             <type by_reference="false">int</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="166" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="170" package="">
         <name>beginTransaction</name>
         <type>function</type>
-        <docblock line="161">
+        <docblock line="165">
           <description><![CDATA[Start a database transaction]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="161" name="return" description="" type="bool">
+          <tag line="165" name="return" description="" type="bool">
             <type by_reference="false">bool</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="183" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="187" package="">
         <name>commit</name>
         <type>function</type>
-        <docblock line="178">
+        <docblock line="182">
           <description><![CDATA[Commit a database transaction]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="178" name="return" description="" type="bool">
+          <tag line="182" name="return" description="" type="bool">
             <type by_reference="false">bool</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="195" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="199" package="">
         <name>rollBack</name>
         <type>function</type>
-        <docblock line="190">
+        <docblock line="194">
           <description><![CDATA[Rollback a transaction]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="190" name="return" description="" type="bool">
+          <tag line="194" name="return" description="" type="bool">
             <type by_reference="false">bool</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="209" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="213" package="">
         <name>prepare_execute</name>
         <type>function</type>
-        <docblock line="202">
+        <docblock line="206">
           <description><![CDATA[Prepare and execute a query]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="202" name="param" description="" type="string" variable="$sql">
+          <tag line="206" name="param" description="" type="string" variable="$sql">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="202" name="param" description="" type="array" variable="$args">
+          <tag line="206" name="param" description="" type="array" variable="$args">
             <type by_reference="false">array</type>
           </tag>
-          <tag line="202" name="return" description="" type="resource">
+          <tag line="206" name="return" description="" type="resource">
             <type by_reference="false">resource</type>
           </tag>
         </docblock>
-        <argument line="209">
+        <argument line="213">
           <name>$sql</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="209">
+        <argument line="213">
           <name>$args</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="228" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="232" package="">
         <name>quote</name>
         <type>function</type>
-        <docblock line="221">
+        <docblock line="225">
           <description><![CDATA[Method to emulate PDO->quote]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="221" name="param" description="" type="string" variable="$str">
+          <tag line="225" name="param" description="" type="string" variable="$str">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="221" name="param" description="" type="int" variable="$param_type">
+          <tag line="225" name="param" description="" type="int" variable="$param_type">
             <type by_reference="false">int</type>
           </tag>
-          <tag line="221" name="return" description="" type="string">
+          <tag line="225" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
-        <argument line="228">
+        <argument line="232">
           <name>$str</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="228">
+        <argument line="232">
           <name>$param_type</name>
           <default><![CDATA[NULL]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="245" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="249" package="">
         <name>errorInfo</name>
         <type>function</type>
-        <docblock line="240">
+        <docblock line="244">
           <description><![CDATA[Method to emulate PDO->errorInfo / PDOStatement->errorInfo]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="240" name="return" description="" type="array">
+          <tag line="244" name="return" description="" type="array">
             <type by_reference="false">array</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="260" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="264" package="">
         <name>errorCode</name>
         <type>function</type>
-        <docblock line="255">
+        <docblock line="259">
           <description><![CDATA[Method to emulate PDO->errorCode]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="255" name="return" description="" type="array">
+          <tag line="259" name="return" description="" type="array">
             <type by_reference="false">array</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="274" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="278" package="">
         <name>prepare_query</name>
         <type>function</type>
-        <docblock line="267">
+        <docblock line="271">
           <description><![CDATA[Bind a prepared query with arguments for executing]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="267" name="param" description="" type="string" variable="$sql">
+          <tag line="271" name="param" description="" type="string" variable="$sql">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="267" name="param" description="" type="array" variable="$params">
+          <tag line="271" name="param" description="" type="array" variable="$params">
             <type by_reference="false">array</type>
           </tag>
-          <tag line="267" name="return" description="" type="FALSE">
+          <tag line="271" name="return" description="" type="FALSE">
             <type by_reference="false">FALSE</type>
           </tag>
         </docblock>
-        <argument line="274">
+        <argument line="278">
           <name>$sql</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="274">
+        <argument line="278">
           <name>$params</name>
           <default><![CDATA[]]></default>
           <type/>
@@ -4787,137 +4847,140 @@ the last query executed]]></description>
       </method>
     </class>
   </file>
-  <file path="sys/db/drivers/firebird/firebird_util.php" hash="934a008ad9515b672f6e6aef7958583d" package="Default">
+  <file path="sys/db/drivers/firebird/firebird_util.php" hash="e51cf49b7bb1e2bb39ed5eab9bf6e98c" package="Query">
     <docblock line="2">
       <description><![CDATA[Query]]></description>
       <long-description><![CDATA[<p>Free Query Builder / Database Abstraction Layer</p>]]></long-description>
+      <tag line="2" name="package" description="Query"/>
       <tag line="2" name="author" description="Timothy J. Warren"/>
       <tag line="2" name="copyright" description="Copyright (c) 2012"/>
       <tag line="2" name="link" description="https://github.com/aviat4ion/Query" link="https://github.com/aviat4ion/Query"/>
       <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
     </docblock>
-    <class final="false" abstract="false" namespace="default" line="18" package="Default">
+    <class final="false" abstract="false" namespace="default" line="22" package="Query\Drivers">
       <name>Firebird_Util</name>
       <full_name>\Firebird_Util</full_name>
       <extends>\DB_Util</extends>
-      <docblock line="15">
+      <docblock line="16">
         <description><![CDATA[Firebird-specific backup, import and creation methods]]></description>
         <long-description><![CDATA[]]></long-description>
+        <tag line="16" name="package" description="Query"/>
+        <tag line="16" name="subpackage" description="Drivers"/>
       </docblock>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="26" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="30" package="">
         <name>__construct</name>
         <type>function</type>
-        <docblock line="20">
+        <docblock line="24">
           <description><![CDATA[Save a reference to the current connection object]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="20" name="param" description="&amp;$conn" type="object" variable="$conn">
+          <tag line="24" name="param" description="&amp;$conn" type="object" variable="$conn">
             <type by_reference="false">object</type>
           </tag>
-          <tag line="20" name="return" description="" type="void">
+          <tag line="24" name="return" description="" type="void">
             <type by_reference="false">void</type>
           </tag>
         </docblock>
-        <argument line="26">
+        <argument line="30">
           <name>$conn</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="43" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="47" package="">
         <name>create_table</name>
         <type>function</type>
-        <docblock line="33">
+        <docblock line="37">
           <description><![CDATA[Convienience public function to generate sql for creating a db table]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="33" name="param" description="" type="string" variable="$name">
+          <tag line="37" name="param" description="" type="string" variable="$name">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="33" name="param" description="" type="array" variable="$fields">
+          <tag line="37" name="param" description="" type="array" variable="$fields">
             <type by_reference="false">array</type>
           </tag>
-          <tag line="33" name="param" description="" type="array" variable="$constraints">
+          <tag line="37" name="param" description="" type="array" variable="$constraints">
             <type by_reference="false">array</type>
           </tag>
-          <tag line="33" name="param" description="" type="array" variable="$indexes">
+          <tag line="37" name="param" description="" type="array" variable="$indexes">
             <type by_reference="false">array</type>
           </tag>
-          <tag line="33" name="return" description="" type="string">
+          <tag line="37" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
-        <argument line="43">
+        <argument line="47">
           <name>$name</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="43">
+        <argument line="47">
           <name>$fields</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="43">
+        <argument line="47">
           <name>$constraints</name>
           <default><![CDATA[array()]]></default>
           <type>array</type>
         </argument>
-        <argument line="43">
+        <argument line="47">
           <name>$indexes</name>
           <default><![CDATA[array()]]></default>
           <type>array</type>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="99" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="103" package="">
         <name>delete_table</name>
         <type>function</type>
-        <docblock line="93">
+        <docblock line="97">
           <description><![CDATA[Drop the selected table]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="93" name="param" description="" type="string" variable="$name">
+          <tag line="97" name="param" description="" type="string" variable="$name">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="93" name="return" description="" type="string">
+          <tag line="97" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
-        <argument line="99">
+        <argument line="103">
           <name>$name</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="111" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="115" package="">
         <name>backup_structure</name>
         <type>function</type>
-        <docblock line="106">
+        <docblock line="110">
           <description><![CDATA[Create an SQL backup file for the current database's structure]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="106" name="return" description="" type="string">
+          <tag line="110" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="126" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="130" package="">
         <name>backup_data</name>
         <type>function</type>
-        <docblock line="119">
+        <docblock line="123">
           <description><![CDATA[Create an SQL backup file for the current database's data]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="119" name="param" description="" type="array" variable="$exclude">
+          <tag line="123" name="param" description="" type="array" variable="$exclude">
             <type by_reference="false">array</type>
           </tag>
-          <tag line="119" name="param" description="" type="bool" variable="$system_tables">
+          <tag line="123" name="param" description="" type="bool" variable="$system_tables">
             <type by_reference="false">bool</type>
           </tag>
-          <tag line="119" name="return" description="" type="string">
+          <tag line="123" name="return" description="" type="string">
             <type by_reference="false">string</type>
           </tag>
         </docblock>
-        <argument line="126">
+        <argument line="130">
           <name>$exclude</name>
           <default><![CDATA[array()]]></default>
           <type/>
         </argument>
-        <argument line="126">
+        <argument line="130">
           <name>$system_tables</name>
           <default><![CDATA[FALSE]]></default>
           <type/>
@@ -4925,443 +4988,462 @@ the last query executed]]></description>
       </method>
     </class>
   </file>
-  <file path="sys/common/functions.php" hash="59d8086bb0f8614b8f25e2196197b599" package="Default">
+  <file path="sys/common/functions.php" hash="f4432e0bafd396b0777ad5d1771654a8" package="OpenSQLManager">
     <docblock line="2">
       <description><![CDATA[OpenSQLManager]]></description>
       <long-description><![CDATA[<p>Free Database manager for Open Source Databases</p>]]></long-description>
+      <tag line="2" name="package" description="OpenSQLManager"/>
       <tag line="2" name="author" description="Timothy J. Warren"/>
       <tag line="2" name="copyright" description="Copyright (c) 2012"/>
       <tag line="2" name="link" description="https://github.com/aviat4ion/OpenSQLManager" link="https://github.com/aviat4ion/OpenSQLManager"/>
       <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
     </docblock>
-    <function namespace="default" line="23" package="Default">
+    <function namespace="default" line="24" package="OpenSQLManager">
       <name>array_to_object</name>
       <type>function</type>
-      <docblock line="17">
+      <docblock line="18">
         <description><![CDATA[Convert an array to an object]]></description>
         <long-description><![CDATA[]]></long-description>
-        <tag line="17" name="param" description="" type="array" variable="$array">
+        <tag line="18" name="param" description="" type="array" variable="$array">
           <type by_reference="false">array</type>
         </tag>
-        <tag line="17" name="return" description="" type="object">
+        <tag line="18" name="return" description="" type="object">
           <type by_reference="false">object</type>
         </tag>
       </docblock>
-      <argument line="23">
+      <argument line="24">
         <name>$array</name>
         <default><![CDATA[]]></default>
         <type/>
       </argument>
     </function>
-    <function namespace="default" line="48" package="Default">
+    <function namespace="default" line="49" package="OpenSQLManager">
       <name>alert</name>
       <type>function</type>
-      <docblock line="42">
-        <description><![CDATA[Create info dialog to retun an informational message]]></description>
+      <docblock line="43">
+        <description><![CDATA[Create info dialog to return an informational message]]></description>
         <long-description><![CDATA[]]></long-description>
-        <tag line="42" name="param" description="" type="string" variable="$message">
+        <tag line="43" name="param" description="" type="string" variable="$message">
           <type by_reference="false">string</type>
         </tag>
-        <tag line="42" name="return" description="" type="void">
+        <tag line="43" name="return" description="" type="void">
           <type by_reference="false">void</type>
         </tag>
       </docblock>
-      <argument line="48">
+      <argument line="49">
         <name>$message</name>
         <default><![CDATA[]]></default>
         <type/>
       </argument>
     </function>
-    <function namespace="default" line="71" package="Default">
+    <function namespace="default" line="72" package="OpenSQLManager">
       <name>error</name>
       <type>function</type>
-      <docblock line="65">
+      <docblock line="66">
         <description><![CDATA[Create info dialog to retun an informational message]]></description>
         <long-description><![CDATA[]]></long-description>
-        <tag line="65" name="param" description="" type="string" variable="$message">
+        <tag line="66" name="param" description="" type="string" variable="$message">
           <type by_reference="false">string</type>
         </tag>
-        <tag line="65" name="return" description="" type="void">
+        <tag line="66" name="return" description="" type="void">
           <type by_reference="false">void</type>
         </tag>
       </docblock>
-      <argument line="71">
+      <argument line="72">
         <name>$message</name>
         <default><![CDATA[]]></default>
         <type/>
       </argument>
     </function>
-    <function namespace="default" line="94" package="Default">
+    <function namespace="default" line="95" package="OpenSQLManager">
       <name>confirm</name>
       <type>function</type>
-      <docblock line="88">
+      <docblock line="89">
         <description><![CDATA[Creates a binary confirmation dialog]]></description>
         <long-description><![CDATA[]]></long-description>
-        <tag line="88" name="param" description="" type="string" variable="$message">
+        <tag line="89" name="param" description="" type="string" variable="$message">
           <type by_reference="false">string</type>
         </tag>
-        <tag line="88" name="return" description="" type="bool">
+        <tag line="89" name="return" description="" type="bool">
           <type by_reference="false">bool</type>
         </tag>
       </docblock>
-      <argument line="94">
+      <argument line="95">
         <name>$message</name>
         <default><![CDATA[]]></default>
         <type/>
       </argument>
     </function>
-    <function namespace="default" line="118" package="Default">
+    <function namespace="default" line="119" package="OpenSQLManager">
       <name>about</name>
       <type>function</type>
-      <docblock line="113">
+      <docblock line="114">
         <description><![CDATA[Display About menu with version information]]></description>
         <long-description><![CDATA[]]></long-description>
-        <tag line="113" name="return" description="" type="void">
+        <tag line="114" name="return" description="" type="void">
           <type by_reference="false">void</type>
         </tag>
       </docblock>
     </function>
   </file>
-  <file path="sys/widgets/connection_sidebar.php" hash="5e0c7e897ba20b8df7d8875522955a9d" package="Default">
+  <file path="sys/widgets/connection_sidebar.php" hash="e8e4b11dc7014008f2b3ae56cf628b0c" package="OpenSQLManager">
     <docblock line="2">
       <description><![CDATA[OpenSQLManager]]></description>
       <long-description><![CDATA[<p>Free Database manager for Open Source Databases</p>]]></long-description>
+      <tag line="2" name="package" description="OpenSQLManager"/>
       <tag line="2" name="author" description="Timothy J. Warren"/>
       <tag line="2" name="copyright" description="Copyright (c) 2012"/>
       <tag line="2" name="link" description="https://github.com/aviat4ion/OpenSQLManager" link="https://github.com/aviat4ion/OpenSQLManager"/>
       <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
     </docblock>
-    <class final="false" abstract="false" namespace="default" line="18" package="Default">
+    <class final="false" abstract="false" namespace="default" line="22" package="OpenSQLManager\Widgets">
       <name>Connection_Sidebar</name>
       <full_name>\Connection_Sidebar</full_name>
       <extends>\GtkVBox</extends>
-      <docblock line="15">
+      <docblock line="16">
         <description><![CDATA[Widget managing saved database connections]]></description>
         <long-description><![CDATA[]]></long-description>
+        <tag line="16" name="package" description="OpenSQLManager"/>
+        <tag line="16" name="subpackage" description="Widgets"/>
       </docblock>
-      <property final="false" static="false" visibility="protected" line="23" package="Default">
+      <property final="false" static="false" visibility="protected" line="29" package="Default">
         <name>$settings</name>
         <default><![CDATA[]]></default>
-        <docblock line="20">
+        <docblock line="24">
           <description><![CDATA[Reference to Settings instance]]></description>
           <long-description><![CDATA[]]></long-description>
+          <tag line="24" name="var" description="" type="\Settings">
+            <type by_reference="false">\Settings</type>
+          </tag>
         </docblock>
       </property>
-      <property final="false" static="false" visibility="protected" line="28" package="Default">
+      <property final="false" static="false" visibility="protected" line="36" package="Default">
         <name>$menu</name>
         <default><![CDATA[]]></default>
-        <docblock line="25">
+        <docblock line="31">
           <description><![CDATA[Reference to popup menu]]></description>
           <long-description><![CDATA[]]></long-description>
+          <tag line="31" name="var" description="" type="\GtkMenu">
+            <type by_reference="false">\GtkMenu</type>
+          </tag>
         </docblock>
       </property>
-      <property final="false" static="false" visibility="protected" line="33" package="Default">
+      <property final="false" static="false" visibility="protected" line="43" package="Default">
         <name>$treeview</name>
         <default><![CDATA[]]></default>
-        <docblock line="30">
+        <docblock line="38">
           <description><![CDATA[Treeview for displaying connections]]></description>
           <long-description><![CDATA[]]></long-description>
+          <tag line="38" name="var" description="" type="\GtkTreeView">
+            <type by_reference="false">\GtkTreeView</type>
+          </tag>
         </docblock>
       </property>
-      <property final="false" static="true" visibility="private" line="38" package="Default">
+      <property final="false" static="true" visibility="private" line="50" package="Default">
         <name>$instance</name>
         <default><![CDATA[]]></default>
-        <docblock line="35">
+        <docblock line="45">
           <description><![CDATA[Singleton instance]]></description>
           <long-description><![CDATA[]]></long-description>
+          <tag line="45" name="var" description="" type="\Connection_Sidebar">
+            <type by_reference="false">\Connection_Sidebar</type>
+          </tag>
         </docblock>
       </property>
-      <property final="false" static="false" visibility="private" line="43" package="Default">
+      <property final="false" static="false" visibility="private" line="57" package="Default">
         <name>$conn_name</name>
         <default><![CDATA[]]></default>
-        <docblock line="40">
+        <docblock line="52">
           <description><![CDATA[Name of current db connection]]></description>
           <long-description><![CDATA[]]></long-description>
+          <tag line="52" name="var" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
         </docblock>
       </property>
-      <method final="false" abstract="false" static="true" visibility="public" namespace="default" line="50" package="">
+      <method final="false" abstract="false" static="true" visibility="public" namespace="default" line="64" package="">
         <name>get_instance</name>
         <type>function</type>
-        <docblock line="45">
+        <docblock line="59">
           <description><![CDATA[Return the current instance of the class]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="45" name="return" description="" type="\Connection_Sidebar">
+          <tag line="59" name="return" description="" type="\Connection_Sidebar">
             <type by_reference="false">\Connection_Sidebar</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="66" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="80" package="">
         <name>__construct</name>
         <type>function</type>
-        <docblock line="63">
+        <docblock line="77">
           <description><![CDATA[Constructor method]]></description>
           <long-description><![CDATA[]]></long-description>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="protected" namespace="default" line="102" package="">
+      <method final="false" abstract="false" static="false" visibility="protected" namespace="default" line="116" package="">
         <name>_render</name>
         <type>function</type>
-        <docblock line="97">
+        <docblock line="111">
           <description><![CDATA[Renders the connection sidebar widget]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="97" name="return" description="" type="void">
+          <tag line="111" name="return" description="" type="void">
             <type by_reference="false">void</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="161" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="175" package="">
         <name>set_icon</name>
         <type>function</type>
-        <docblock line="152">
+        <docblock line="166">
           <description><![CDATA[Sets the icon for the current db type]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="152" name="param" description="Column $col" type="\GtkTreeView" variable="$col">
+          <tag line="166" name="param" description="Column $col" type="\GtkTreeView" variable="$col">
             <type by_reference="false">\GtkTreeView</type>
           </tag>
-          <tag line="152" name="param" description="" type="\GtkCellRenderer" variable="$cell">
+          <tag line="166" name="param" description="" type="\GtkCellRenderer" variable="$cell">
             <type by_reference="false">\GtkCellRenderer</type>
           </tag>
-          <tag line="152" name="param" description="" type="\GtkTreeModel" variable="$model">
+          <tag line="166" name="param" description="" type="\GtkTreeModel" variable="$model">
             <type by_reference="false">\GtkTreeModel</type>
           </tag>
-          <tag line="152" name="param" description="" type="\GtkTreeIter" variable="$iter">
+          <tag line="166" name="param" description="" type="\GtkTreeIter" variable="$iter">
             <type by_reference="false">\GtkTreeIter</type>
           </tag>
-          <tag line="152" name="return" description="" type="void">
+          <tag line="166" name="return" description="" type="void">
             <type by_reference="false">void</type>
           </tag>
         </docblock>
-        <argument line="161">
+        <argument line="175">
           <name>$col</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="161">
+        <argument line="175">
           <name>$cell</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="161">
+        <argument line="175">
           <name>$model</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="161">
+        <argument line="175">
           <name>$iter</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="191" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="205" package="">
         <name>set_label</name>
         <type>function</type>
-        <docblock line="182">
+        <docblock line="196">
           <description><![CDATA[Sets the label of the current db connection]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="182" name="param" description="" type="\GtkTreeViewColumn" variable="$col">
+          <tag line="196" name="param" description="" type="\GtkTreeViewColumn" variable="$col">
             <type by_reference="false">\GtkTreeViewColumn</type>
           </tag>
-          <tag line="182" name="param" description="" type="\GtkCellRenderer" variable="$cell">
+          <tag line="196" name="param" description="" type="\GtkCellRenderer" variable="$cell">
             <type by_reference="false">\GtkCellRenderer</type>
           </tag>
-          <tag line="182" name="param" description="" type="\GtkTreeModel" variable="$model">
+          <tag line="196" name="param" description="" type="\GtkTreeModel" variable="$model">
             <type by_reference="false">\GtkTreeModel</type>
           </tag>
-          <tag line="182" name="param" description="" type="\GtkTreeIter" variable="$iter">
+          <tag line="196" name="param" description="" type="\GtkTreeIter" variable="$iter">
             <type by_reference="false">\GtkTreeIter</type>
           </tag>
-          <tag line="182" name="return" description="" type="void">
+          <tag line="196" name="return" description="" type="void">
             <type by_reference="false">void</type>
           </tag>
         </docblock>
-        <argument line="191">
+        <argument line="205">
           <name>$col</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="191">
+        <argument line="205">
           <name>$cell</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="191">
+        <argument line="205">
           <name>$model</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="191">
+        <argument line="205">
           <name>$iter</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="209" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="223" package="">
         <name>set_status_icon</name>
         <type>function</type>
-        <docblock line="200">
+        <docblock line="214">
           <description><![CDATA[Sets the status icon of the current db connection]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="200" name="param" description="" type="\GtkTreeViewColumn" variable="$col">
+          <tag line="214" name="param" description="" type="\GtkTreeViewColumn" variable="$col">
             <type by_reference="false">\GtkTreeViewColumn</type>
           </tag>
-          <tag line="200" name="param" description="" type="\GtkCellRenderer" variable="$cell">
+          <tag line="214" name="param" description="" type="\GtkCellRenderer" variable="$cell">
             <type by_reference="false">\GtkCellRenderer</type>
           </tag>
-          <tag line="200" name="param" description="" type="\GtkTreeModel" variable="$model">
+          <tag line="214" name="param" description="" type="\GtkTreeModel" variable="$model">
             <type by_reference="false">\GtkTreeModel</type>
           </tag>
-          <tag line="200" name="param" description="" type="\GtkTreeIter" variable="$iter">
+          <tag line="214" name="param" description="" type="\GtkTreeIter" variable="$iter">
             <type by_reference="false">\GtkTreeIter</type>
           </tag>
-          <tag line="200" name="return" description="" type="void">
+          <tag line="214" name="return" description="" type="void">
             <type by_reference="false">void</type>
           </tag>
         </docblock>
-        <argument line="209">
+        <argument line="223">
           <name>$col</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="209">
+        <argument line="223">
           <name>$cell</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="209">
+        <argument line="223">
           <name>$model</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="209">
+        <argument line="223">
           <name>$iter</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="233" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="247" package="">
         <name>new_conn</name>
         <type>function</type>
-        <docblock line="228">
+        <docblock line="242">
           <description><![CDATA[Returns window for creating a new database connection]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="228" name="return" description="object" type="\Add_DB">
+          <tag line="242" name="return" description="object" type="\Add_DB">
             <type by_reference="false">\Add_DB</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="247" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="261" package="">
         <name>on_button</name>
         <type>function</type>
-        <docblock line="240">
+        <docblock line="254">
           <description><![CDATA[Event for mouse clicks on connection sidebar]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="240" name="param" description="" type="\GtkTreeView" variable="$view">
+          <tag line="254" name="param" description="" type="\GtkTreeView" variable="$view">
             <type by_reference="false">\GtkTreeView</type>
           </tag>
-          <tag line="240" name="param" description="" type="" variable="$event"/>
-          <tag line="240" name="return" description="" type="void">
+          <tag line="254" name="param" description="" type="" variable="$event"/>
+          <tag line="254" name="return" description="" type="void">
             <type by_reference="false">void</type>
           </tag>
         </docblock>
-        <argument line="247">
+        <argument line="261">
           <name>$view</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="247">
+        <argument line="261">
           <name>$event</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="281" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="295" package="">
         <name>conn_popup_menu</name>
         <type>function</type>
-        <docblock line="275">
+        <docblock line="289">
           <description><![CDATA[Creates and displays a context menu for the selected connection]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="275" name="param" description="" type="array" variable="$all">
+          <tag line="289" name="param" description="" type="array" variable="$all">
             <type by_reference="false">array</type>
           </tag>
-          <tag line="275" name="return" description="" type="void">
+          <tag line="289" name="return" description="" type="void">
             <type by_reference="false">void</type>
           </tag>
         </docblock>
-        <argument line="281">
+        <argument line="295">
           <name>$all</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="338" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="352" package="">
         <name>refresh</name>
         <type>function</type>
-        <docblock line="333">
+        <docblock line="347">
           <description><![CDATA[Recreate sidebar widget to update connections]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="333" name="return" description="" type="void">
+          <tag line="347" name="return" description="" type="void">
             <type by_reference="false">void</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="351" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="365" package="">
         <name>edit_connection</name>
         <type>function</type>
-        <docblock line="346">
+        <docblock line="360">
           <description><![CDATA[Update the connection information for an existing connection]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="346" name="return" description="" type="void">
+          <tag line="360" name="return" description="" type="void">
             <type by_reference="false">void</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="363" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="377" package="">
         <name>remove_connection</name>
         <type>function</type>
-        <docblock line="358">
+        <docblock line="372">
           <description><![CDATA[Remove a connection from the connection manager]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="358" name="return" description="" type="void">
+          <tag line="372" name="return" description="" type="void">
             <type by_reference="false">void</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="387" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="401" package="">
         <name>db_connect</name>
         <type>function</type>
-        <docblock line="382">
+        <docblock line="396">
           <description><![CDATA[Create connection to a database]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="382" name="return" description="" type="void">
+          <tag line="396" name="return" description="" type="void">
             <type by_reference="false">void</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="413" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="427" package="">
         <name>db_disconnect</name>
         <type>function</type>
-        <docblock line="408">
+        <docblock line="422">
           <description><![CDATA[Disconnect from a database]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="408" name="return" description="" type="void">
+          <tag line="422" name="return" description="" type="void">
             <type by_reference="false">void</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="431" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="445" package="">
         <name>switch_tab</name>
         <type>function</type>
-        <docblock line="425">
+        <docblock line="439">
           <description><![CDATA[Change tabs based on db connection selected]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="425" name="param" description="" type="\GtkTreeView" variable="$view">
+          <tag line="439" name="param" description="" type="\GtkTreeView" variable="$view">
             <type by_reference="false">\GtkTreeView</type>
           </tag>
-          <tag line="425" name="return" description="" type="void">
+          <tag line="439" name="return" description="" type="void">
             <type by_reference="false">void</type>
           </tag>
         </docblock>
-        <argument line="431">
+        <argument line="445">
           <name>$view</name>
           <default><![CDATA[]]></default>
           <type/>
@@ -5369,150 +5451,156 @@ the last query executed]]></description>
       </method>
     </class>
   </file>
-  <file path="sys/widgets/data_grid.php" hash="9c11cad12669fb7531f526d3e5fc33a5" package="Default">
+  <file path="sys/widgets/data_grid.php" hash="27084ec65e2223255f1903416146f692" package="OpenSQLManager">
     <docblock line="2">
       <description><![CDATA[OpenSQLManager]]></description>
       <long-description><![CDATA[<p>Free Database manager for Open Source Databases</p>]]></long-description>
+      <tag line="2" name="package" description="OpenSQLManager"/>
       <tag line="2" name="author" description="Timothy J. Warren"/>
       <tag line="2" name="copyright" description="Copyright (c) 2012"/>
       <tag line="2" name="link" description="https://github.com/aviat4ion/OpenSQLManager" link="https://github.com/aviat4ion/OpenSQLManager"/>
       <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
     </docblock>
-    <class final="false" abstract="false" namespace="default" line="18" package="Default">
+    <class final="false" abstract="false" namespace="default" line="22" package="OpenSQLManager\Widgets">
       <name>Data_Grid</name>
       <full_name>\Data_Grid</full_name>
       <extends>\GtkTreeView</extends>
-      <docblock line="15">
+      <docblock line="16">
         <description><![CDATA[Class to simplify dealing with GtkTreeView]]></description>
         <long-description><![CDATA[]]></long-description>
+        <tag line="16" name="package" description="OpenSQLManager"/>
+        <tag line="16" name="subpackage" description="Widgets"/>
       </docblock>
-      <property final="false" static="false" visibility="protected" line="23" package="Default">
+      <property final="false" static="false" visibility="protected" line="29" package="Default">
         <name>$model</name>
         <default><![CDATA[]]></default>
-        <docblock line="20">
+        <docblock line="24">
           <description><![CDATA[GtkTreeStore object]]></description>
           <long-description><![CDATA[]]></long-description>
+          <tag line="24" name="var" description="" type="\GtkTreeStore">
+            <type by_reference="false">\GtkTreeStore</type>
+          </tag>
         </docblock>
       </property>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="30" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="36" package="">
         <name>__construct</name>
         <type>function</type>
-        <docblock line="25">
+        <docblock line="31">
           <description><![CDATA[Create the object]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="25" name="param" description="" type="object" variable="$model">
+          <tag line="31" name="param" description="" type="object" variable="$model">
             <type by_reference="false">object</type>
           </tag>
         </docblock>
-        <argument line="30">
+        <argument line="36">
           <name>$model</name>
           <default><![CDATA[null]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="51" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="57" package="">
         <name>get</name>
         <type>function</type>
-        <docblock line="45">
+        <docblock line="51">
           <description><![CDATA[Get the value of the model for the current selection]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="45" name="param" description="pos" type="int" variable="$pos">
+          <tag line="51" name="param" description="pos" type="int" variable="$pos">
             <type by_reference="false">int</type>
           </tag>
-          <tag line="45" name="return" description="" type="mixed">
+          <tag line="51" name="return" description="" type="mixed">
             <type by_reference="false">mixed</type>
           </tag>
         </docblock>
-        <argument line="51">
+        <argument line="57">
           <name>$pos</name>
           <default><![CDATA[0]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="81" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="87" package="">
         <name>reset</name>
         <type>function</type>
-        <docblock line="76">
+        <docblock line="82">
           <description><![CDATA[Clear datagrid]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="76" name="return" description="" type="void">
+          <tag line="82" name="return" description="" type="void">
             <type by_reference="false">void</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="105" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="111" package="">
         <name>add_data_col</name>
         <type>function</type>
-        <docblock line="95">
+        <docblock line="101">
           <description><![CDATA[Adds a column of data to the model]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="95" name="param" description="" type="\GtkTreeViewColumn" variable="$col">
+          <tag line="101" name="param" description="" type="\GtkTreeViewColumn" variable="$col">
             <type by_reference="false">\GtkTreeViewColumn</type>
           </tag>
-          <tag line="95" name="param" description="" type="\GtkCellRenderer" variable="$cell">
+          <tag line="101" name="param" description="" type="\GtkCellRenderer" variable="$cell">
             <type by_reference="false">\GtkCellRenderer</type>
           </tag>
-          <tag line="95" name="param" description="" type="\GtkTreeModel" variable="$model">
+          <tag line="101" name="param" description="" type="\GtkTreeModel" variable="$model">
             <type by_reference="false">\GtkTreeModel</type>
           </tag>
-          <tag line="95" name="param" description="" type="\GtkTreeIter" variable="$iter">
+          <tag line="101" name="param" description="" type="\GtkTreeIter" variable="$iter">
             <type by_reference="false">\GtkTreeIter</type>
           </tag>
-          <tag line="95" name="param" description="" type="int" variable="$i">
+          <tag line="101" name="param" description="" type="int" variable="$i">
             <type by_reference="false">int</type>
           </tag>
-          <tag line="95" name="return" description="" type="void">
+          <tag line="101" name="return" description="" type="void">
             <type by_reference="false">void</type>
           </tag>
         </docblock>
-        <argument line="105">
+        <argument line="111">
           <name>$col</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="105">
+        <argument line="111">
           <name>$cell</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="105">
+        <argument line="111">
           <name>$model</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="105">
+        <argument line="111">
           <name>$iter</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="105">
+        <argument line="111">
           <name>$i</name>
           <default><![CDATA[0]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="127" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="133" package="">
         <name>render_data</name>
         <type>function</type>
-        <docblock line="120">
+        <docblock line="126">
           <description><![CDATA[Create a datagrid from the provided data array]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="120" name="param" description="" type="array" variable="$data">
+          <tag line="126" name="param" description="" type="array" variable="$data">
             <type by_reference="false">array</type>
           </tag>
-          <tag line="120" name="param" description="" type="array" variable="$events">
+          <tag line="126" name="param" description="" type="array" variable="$events">
             <type by_reference="false">array</type>
           </tag>
-          <tag line="120" name="return" description="" type="void">
+          <tag line="126" name="return" description="" type="void">
             <type by_reference="false">void</type>
           </tag>
         </docblock>
-        <argument line="127">
+        <argument line="133">
           <name>$data</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="127">
+        <argument line="133">
           <name>$events</name>
           <default><![CDATA[array()]]></default>
           <type/>
@@ -5520,309 +5608,315 @@ the last query executed]]></description>
       </method>
     </class>
   </file>
-  <file path="sys/widgets/db_tabs.php" hash="c6bc70a593556d0cc864f37443269c1c" package="Default">
+  <file path="sys/widgets/db_tabs.php" hash="5b9a9058828f27c8be581396d9ccde6e" package="OpenSQLManager">
     <docblock line="2">
       <description><![CDATA[OpenSQLManager]]></description>
       <long-description><![CDATA[<p>Free Database manager for Open Source Databases</p>]]></long-description>
+      <tag line="2" name="package" description="OpenSQLManager"/>
       <tag line="2" name="author" description="Timothy J. Warren"/>
       <tag line="2" name="copyright" description="Copyright (c) 2012"/>
       <tag line="2" name="link" description="https://github.com/aviat4ion/OpenSQLManager" link="https://github.com/aviat4ion/OpenSQLManager"/>
       <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
     </docblock>
-    <class final="false" abstract="false" namespace="default" line="18" package="Default">
+    <class final="false" abstract="false" namespace="default" line="22" package="OpenSQLManager\Widgets">
       <name>DB_tabs</name>
       <full_name>\DB_tabs</full_name>
       <extends>\GTKNotebook</extends>
-      <docblock line="15">
+      <docblock line="16">
         <description><![CDATA[Tabbed Container for database properties]]></description>
         <long-description><![CDATA[]]></long-description>
+        <tag line="16" name="package" description="OpenSQLManager"/>
+        <tag line="16" name="subpackage" description="Widgets"/>
       </docblock>
-      <property final="false" static="true" visibility="private" line="24" package="Default">
+      <property final="false" static="true" visibility="private" line="29" package="Default">
         <name>$instance</name>
         <default><![CDATA[]]></default>
-        <docblock line="20">
+        <docblock line="24">
           <description><![CDATA[Current Tab Widget object]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="20" name="var" description="" type="\DB_Tabs">
+          <tag line="24" name="var" description="" type="\DB_Tabs">
             <type by_reference="false">\DB_Tabs</type>
           </tag>
         </docblock>
       </property>
-      <property final="false" static="false" visibility="private" line="29" package="Default">
+      <property final="false" static="false" visibility="private" line="36" package="Default">
         <name>$data</name>
         <default><![CDATA[]]></default>
-        <docblock line="26">
+        <docblock line="31">
           <description><![CDATA[Db Data cache]]></description>
           <long-description><![CDATA[]]></long-description>
+          <tag line="31" name="var" description="" type="array">
+            <type by_reference="false">array</type>
+          </tag>
         </docblock>
       </property>
-      <method final="false" abstract="false" static="true" visibility="public" namespace="default" line="36" package="">
+      <method final="false" abstract="false" static="true" visibility="public" namespace="default" line="43" package="">
         <name>get_instance</name>
         <type>function</type>
-        <docblock line="31">
+        <docblock line="38">
           <description><![CDATA[Return the db tabs object if it exists, or create and return]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="31" name="return" description="" type="\DB_tabs">
+          <tag line="38" name="return" description="" type="\DB_tabs">
             <type by_reference="false">\DB_tabs</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="51" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="58" package="">
         <name>__construct</name>
         <type>function</type>
-        <docblock line="48">
+        <docblock line="55">
           <description><![CDATA[Create the object]]></description>
           <long-description><![CDATA[]]></long-description>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="66" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="73" package="">
         <name>add_tab</name>
         <type>function</type>
-        <docblock line="59">
+        <docblock line="66">
           <description><![CDATA[Add a new tab with the provided label]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="59" name="param" description="" type="string" variable="$label">
+          <tag line="66" name="param" description="" type="string" variable="$label">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="59" name="param" description="" type="\GObject" variable="$widget">
+          <tag line="66" name="param" description="" type="\GObject" variable="$widget">
             <type by_reference="false">\GObject</type>
           </tag>
-          <tag line="59" name="return" description="" type="void">
+          <tag line="66" name="return" description="" type="void">
             <type by_reference="false">void</type>
           </tag>
         </docblock>
-        <argument line="66">
+        <argument line="73">
           <name>$label</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="66">
+        <argument line="73">
           <name>$widget</name>
           <default><![CDATA[NULL]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="87" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="94" package="">
         <name>show_table_data</name>
         <type>function</type>
-        <docblock line="78">
+        <docblock line="85">
           <description><![CDATA[Create popup window with table data]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="78" name="param" description="" type="\GTKTreeView" variable="$view">
+          <tag line="85" name="param" description="" type="\GTKTreeView" variable="$view">
             <type by_reference="false">\GTKTreeView</type>
           </tag>
-          <tag line="78" name="param" description="" type="array" variable="$path">
+          <tag line="85" name="param" description="" type="array" variable="$path">
             <type by_reference="false">array</type>
           </tag>
-          <tag line="78" name="param" description="" type="\GtkTreeviewColumn" variable="$col">
+          <tag line="85" name="param" description="" type="\GtkTreeviewColumn" variable="$col">
             <type by_reference="false">\GtkTreeviewColumn</type>
           </tag>
-          <tag line="78" name="param" description="" type="\Query_Builder" variable="$conn">
+          <tag line="85" name="param" description="" type="\Query_Builder" variable="$conn">
             <type by_reference="false">\Query_Builder</type>
           </tag>
-          <tag line="78" name="return" description="" type="void">
+          <tag line="85" name="return" description="" type="void">
             <type by_reference="false">void</type>
           </tag>
         </docblock>
-        <argument line="87">
+        <argument line="94">
           <name>$view</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="87">
+        <argument line="94">
           <name>$path</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="87">
+        <argument line="94">
           <name>$col</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="87">
+        <argument line="94">
           <name>$conn</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="true" visibility="public" namespace="default" line="105" package="">
+      <method final="false" abstract="false" static="true" visibility="public" namespace="default" line="112" package="">
         <name>get_db_tabs</name>
         <type>function</type>
-        <docblock line="99">
+        <docblock line="106">
           <description><![CDATA[Create tabs for database aspects]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="99" name="param" description="" type="\Query_Builder" variable="$conn">
+          <tag line="106" name="param" description="" type="\Query_Builder" variable="$conn">
             <type by_reference="false">\Query_Builder</type>
           </tag>
-          <tag line="99" name="return" description="" type="void">
+          <tag line="106" name="return" description="" type="void">
             <type by_reference="false">void</type>
           </tag>
         </docblock>
-        <argument line="105">
+        <argument line="112">
           <name>$conn</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="true" visibility="public" namespace="default" line="169" package="">
+      <method final="false" abstract="false" static="true" visibility="public" namespace="default" line="176" package="">
         <name>reset</name>
         <type>function</type>
-        <docblock line="163">
+        <docblock line="170">
           <description><![CDATA[Remove current tabs]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="163" name="param" description="" type="string" variable="$conn_name">
+          <tag line="170" name="param" description="" type="string" variable="$conn_name">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="163" name="return" description="" type="void">
+          <tag line="170" name="return" description="" type="void">
             <type by_reference="false">void</type>
           </tag>
         </docblock>
-        <argument line="169">
+        <argument line="176">
           <name>$conn_name</name>
           <default><![CDATA['']]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="true" visibility="private" namespace="default" line="198" package="">
+      <method final="false" abstract="false" static="true" visibility="private" namespace="default" line="205" package="">
         <name>_add_tab</name>
         <type>function</type>
-        <docblock line="188">
+        <docblock line="195">
           <description><![CDATA[Simplify adding tabs to the Notebook object]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="188" name="param" description="" type="object" variable="$conn">
+          <tag line="195" name="param" description="" type="object" variable="$conn">
             <type by_reference="false">object</type>
           </tag>
-          <tag line="188" name="param" description="" type="string" variable="$tab_name">
+          <tag line="195" name="param" description="" type="string" variable="$tab_name">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="188" name="param" description="" type="string" variable="$col_name">
+          <tag line="195" name="param" description="" type="string" variable="$col_name">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="188" name="param" description="" type="string" variable="$method">
+          <tag line="195" name="param" description="" type="string" variable="$method">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="188" name="param" description="" type="array" variable="$events">
+          <tag line="195" name="param" description="" type="array" variable="$events">
             <type by_reference="false">array</type>
           </tag>
-          <tag line="188" name="return" description="" type="void">
+          <tag line="195" name="return" description="" type="void">
             <type by_reference="false">void</type>
           </tag>
         </docblock>
-        <argument line="198">
+        <argument line="205">
           <name>$conn</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="198">
+        <argument line="205">
           <name>$tab_name</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="198">
+        <argument line="205">
           <name>$col_name</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="198">
+        <argument line="205">
           <name>$method</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="198">
+        <argument line="205">
           <name>$events</name>
           <default><![CDATA[array()]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="true" visibility="private" namespace="default" line="251" package="">
+      <method final="false" abstract="false" static="true" visibility="private" namespace="default" line="258" package="">
         <name>_add_row_tab</name>
         <type>function</type>
-        <docblock line="243">
+        <docblock line="250">
           <description><![CDATA[Add a multidimensional array to a tab]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="243" name="param" description="" type="object" variable="$conn">
+          <tag line="250" name="param" description="" type="object" variable="$conn">
             <type by_reference="false">object</type>
           </tag>
-          <tag line="243" name="param" description="" type="string" variable="$tab_name">
+          <tag line="250" name="param" description="" type="string" variable="$tab_name">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="243" name="param" description="" type="string" variable="$method">
+          <tag line="250" name="param" description="" type="string" variable="$method">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="243" name="return" description="" type="void">
+          <tag line="250" name="return" description="" type="void">
             <type by_reference="false">void</type>
           </tag>
         </docblock>
-        <argument line="251">
+        <argument line="258">
           <name>$conn</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="251">
+        <argument line="258">
           <name>$tab_name</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="251">
+        <argument line="258">
           <name>$method</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="286" package="">
+      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="293" package="">
         <name>_get_db_info</name>
         <type>function</type>
-        <docblock line="279">
+        <docblock line="286">
           <description><![CDATA[Returns cached database data for the tab and connection specified]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="279" name="param" description="" type="string" variable="$conn_name">
+          <tag line="286" name="param" description="" type="string" variable="$conn_name">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="279" name="param" description="" type="string" variable="$tab_name">
+          <tag line="286" name="param" description="" type="string" variable="$tab_name">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="279" name="return" description="" type="mixed">
+          <tag line="286" name="return" description="" type="mixed">
             <type by_reference="false">mixed</type>
           </tag>
         </docblock>
-        <argument line="286">
+        <argument line="293">
           <name>$conn_name</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="286">
+        <argument line="293">
           <name>$tab_name</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="313" package="">
+      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="320" package="">
         <name>_set_db_info</name>
         <type>function</type>
-        <docblock line="306">
+        <docblock line="313">
           <description><![CDATA[Sets cached database data for the tab and connection specified]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="306" name="param" description="" type="string" variable="$conn_name">
+          <tag line="313" name="param" description="" type="string" variable="$conn_name">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="306" name="param" description="" type="string" variable="$tab_name">
+          <tag line="313" name="param" description="" type="string" variable="$tab_name">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="306" name="param" description="" type="mixed" variable="$data">
+          <tag line="313" name="param" description="" type="mixed" variable="$data">
             <type by_reference="false">mixed</type>
           </tag>
         </docblock>
-        <argument line="313">
+        <argument line="320">
           <name>$conn_name</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="313">
+        <argument line="320">
           <name>$tab_name</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="313">
+        <argument line="320">
           <name>$data</name>
           <default><![CDATA[]]></default>
           <type/>
@@ -5830,371 +5924,426 @@ the last query executed]]></description>
       </method>
     </class>
   </file>
-  <file path="sys/widgets/db_info_widget.php" hash="09259cfac48caa35b0df4e562fe8aa47" package="Default">
+  <file path="sys/widgets/db_info_widget.php" hash="ed5648eca3f3c152ff202269eedfd780" package="OpenSQLManager">
     <docblock line="2">
       <description><![CDATA[OpenSQLManager]]></description>
       <long-description><![CDATA[<p>Free Database manager for Open Source Databases</p>]]></long-description>
+      <tag line="2" name="package" description="OpenSQLManager"/>
       <tag line="2" name="author" description="Timothy J. Warren"/>
       <tag line="2" name="copyright" description="Copyright (c) 2012"/>
       <tag line="2" name="link" description="https://github.com/aviat4ion/OpenSQLManager" link="https://github.com/aviat4ion/OpenSQLManager"/>
       <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
     </docblock>
-    <class final="false" abstract="false" namespace="default" line="18" package="Default">
+    <class final="false" abstract="false" namespace="default" line="22" package="OpenSQLManager\Widgets">
       <name>DB_Info_Widget</name>
       <full_name>\DB_Info_Widget</full_name>
       <extends>\GtkTable</extends>
-      <docblock line="15">
+      <docblock line="16">
         <description><![CDATA[Widget for adding / editing database connections]]></description>
         <long-description><![CDATA[]]></long-description>
+        <tag line="16" name="package" description="OpenSQLManager"/>
+        <tag line="16" name="subpackage" description="Widgets"/>
       </docblock>
-      <property final="false" static="false" visibility="private" line="24" package="Default">
+      <property final="false" static="false" visibility="private" line="29" package="Default">
         <name>$settings</name>
         <default><![CDATA[]]></default>
-        <docblock line="20">
+        <docblock line="24">
           <description><![CDATA[Alias to Settings::get_instance]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="20" name="var" description="" type="\Settings">
+          <tag line="24" name="var" description="" type="\Settings">
             <type by_reference="false">\Settings</type>
           </tag>
         </docblock>
       </property>
-      <property final="false" static="false" visibility="protected" line="29" package="Default">
+      <property final="false" static="false" visibility="protected" line="36" package="Default">
         <name>$conn</name>
         <default><![CDATA[]]></default>
-        <docblock line="26">
+        <docblock line="31">
           <description><![CDATA[Connection name]]></description>
           <long-description><![CDATA[]]></long-description>
+          <tag line="31" name="var" description="" type="\GtkEntry">
+            <type by_reference="false">\GtkEntry</type>
+          </tag>
         </docblock>
       </property>
-      <property final="false" static="false" visibility="protected" line="34" package="Default">
+      <property final="false" static="false" visibility="protected" line="43" package="Default">
         <name>$conn_db</name>
         <default><![CDATA[]]></default>
-        <docblock line="31">
+        <docblock line="38">
           <description><![CDATA[Connection database name]]></description>
           <long-description><![CDATA[]]></long-description>
+          <tag line="38" name="var" description="" type="\GtkEntry">
+            <type by_reference="false">\GtkEntry</type>
+          </tag>
         </docblock>
       </property>
-      <property final="false" static="false" visibility="protected" line="39" package="Default">
+      <property final="false" static="false" visibility="protected" line="50" package="Default">
         <name>$dbtype</name>
         <default><![CDATA[]]></default>
-        <docblock line="36">
+        <docblock line="45">
           <description><![CDATA[Connection database type]]></description>
           <long-description><![CDATA[]]></long-description>
+          <tag line="45" name="var" description="" type="\GtkComboBox">
+            <type by_reference="false">\GtkComboBox</type>
+          </tag>
         </docblock>
       </property>
-      <property final="false" static="false" visibility="protected" line="44" package="Default">
+      <property final="false" static="false" visibility="protected" line="57" package="Default">
         <name>$host</name>
         <default><![CDATA[]]></default>
-        <docblock line="41">
+        <docblock line="52">
           <description><![CDATA[Connection database host]]></description>
           <long-description><![CDATA[]]></long-description>
-        </docblock>
-      </property>
-      <property final="false" static="false" visibility="protected" line="49" package="Default">
-        <name>$user</name>
-        <default><![CDATA[]]></default>
-        <docblock line="46">
-          <description><![CDATA[Connection user name]]></description>
-          <long-description><![CDATA[]]></long-description>
-        </docblock>
-      </property>
-      <property final="false" static="false" visibility="protected" line="54" package="Default">
-        <name>$pass</name>
-        <default><![CDATA[]]></default>
-        <docblock line="51">
-          <description><![CDATA[Connection password]]></description>
-          <long-description><![CDATA[]]></long-description>
-        </docblock>
-      </property>
-      <property final="false" static="false" visibility="protected" line="59" package="Default">
-        <name>$db_file</name>
-        <default><![CDATA[]]></default>
-        <docblock line="56">
-          <description><![CDATA[Connection database file]]></description>
-          <long-description><![CDATA[]]></long-description>
+          <tag line="52" name="var" description="" type="\GtkEntry">
+            <type by_reference="false">\GtkEntry</type>
+          </tag>
         </docblock>
       </property>
       <property final="false" static="false" visibility="protected" line="64" package="Default">
-        <name>$port</name>
+        <name>$user</name>
         <default><![CDATA[]]></default>
-        <docblock line="61">
-          <description><![CDATA[Connection port]]></description>
+        <docblock line="59">
+          <description><![CDATA[Connection user name]]></description>
           <long-description><![CDATA[]]></long-description>
+          <tag line="59" name="var" description="" type="\GtkEntry">
+            <type by_reference="false">\GtkEntry</type>
+          </tag>
         </docblock>
       </property>
-      <property final="false" static="false" visibility="protected" line="69" package="Default">
-        <name>$old_conn</name>
+      <property final="false" static="false" visibility="protected" line="71" package="Default">
+        <name>$pass</name>
         <default><![CDATA[]]></default>
         <docblock line="66">
+          <description><![CDATA[Connection password]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="66" name="var" description="" type="\GtkEntry">
+            <type by_reference="false">\GtkEntry</type>
+          </tag>
+        </docblock>
+      </property>
+      <property final="false" static="false" visibility="protected" line="78" package="Default">
+        <name>$db_file</name>
+        <default><![CDATA[]]></default>
+        <docblock line="73">
+          <description><![CDATA[Connection database file]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="73" name="var" description="" type="\GtkFileChooserButton">
+            <type by_reference="false">\GtkFileChooserButton</type>
+          </tag>
+        </docblock>
+      </property>
+      <property final="false" static="false" visibility="protected" line="85" package="Default">
+        <name>$port</name>
+        <default><![CDATA[]]></default>
+        <docblock line="80">
+          <description><![CDATA[Connection port]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="80" name="var" description="" type="\GtkEntry">
+            <type by_reference="false">\GtkEntry</type>
+          </tag>
+        </docblock>
+      </property>
+      <property final="false" static="false" visibility="protected" line="92" package="Default">
+        <name>$old_conn</name>
+        <default><![CDATA[]]></default>
+        <docblock line="87">
           <description><![CDATA[Reference to last connection name]]></description>
           <long-description><![CDATA[]]></long-description>
-        </docblock>
-      </property>
-      <property final="false" static="false" visibility="protected" line="74" package="Default">
-        <name>$lblconn</name>
-        <default><![CDATA[]]></default>
-        <docblock line="71">
-          <description><![CDATA[Labels]]></description>
-          <long-description><![CDATA[]]></long-description>
-        </docblock>
-      </property>
-      <property final="false" static="false" visibility="protected" line="79" package="Default">
-        <name>$lblconn_db</name>
-        <default><![CDATA[]]></default>
-        <docblock line="76">
-          <description><![CDATA[Labels]]></description>
-          <long-description><![CDATA[]]></long-description>
-        </docblock>
-      </property>
-      <property final="false" static="false" visibility="protected" line="84" package="Default">
-        <name>$lbldbtype</name>
-        <default><![CDATA[]]></default>
-        <docblock line="81">
-          <description><![CDATA[Labels]]></description>
-          <long-description><![CDATA[]]></long-description>
-        </docblock>
-      </property>
-      <property final="false" static="false" visibility="protected" line="89" package="Default">
-        <name>$lblhost</name>
-        <default><![CDATA[]]></default>
-        <docblock line="86">
-          <description><![CDATA[Labels]]></description>
-          <long-description><![CDATA[]]></long-description>
-        </docblock>
-      </property>
-      <property final="false" static="false" visibility="protected" line="94" package="Default">
-        <name>$lbluser</name>
-        <default><![CDATA[]]></default>
-        <docblock line="91">
-          <description><![CDATA[Labels]]></description>
-          <long-description><![CDATA[]]></long-description>
+          <tag line="87" name="var" description="" type="string">
+            <type by_reference="false">string</type>
+          </tag>
         </docblock>
       </property>
       <property final="false" static="false" visibility="protected" line="99" package="Default">
-        <name>$lblpass</name>
+        <name>$lblconn</name>
         <default><![CDATA[]]></default>
-        <docblock line="96">
-          <description><![CDATA[Labels]]></description>
+        <docblock line="94">
+          <description><![CDATA[Label for connection name]]></description>
           <long-description><![CDATA[]]></long-description>
-        </docblock>
-      </property>
-      <property final="false" static="false" visibility="protected" line="104" package="Default">
-        <name>$lbldatabase</name>
-        <default><![CDATA[]]></default>
-        <docblock line="101">
-          <description><![CDATA[Labels]]></description>
-          <long-description><![CDATA[]]></long-description>
-        </docblock>
-      </property>
-      <property final="false" static="false" visibility="protected" line="109" package="Default">
-        <name>$lbldb_file</name>
-        <default><![CDATA[]]></default>
-        <docblock line="106">
-          <description><![CDATA[Labels]]></description>
-          <long-description><![CDATA[]]></long-description>
-        </docblock>
-      </property>
-      <property final="false" static="false" visibility="protected" line="114" package="Default">
-        <name>$lblport</name>
-        <default><![CDATA[]]></default>
-        <docblock line="111">
-          <description><![CDATA[Labels]]></description>
-          <long-description><![CDATA[]]></long-description>
-        </docblock>
-      </property>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="125" package="">
-        <name>__construct</name>
-        <type>function</type>
-        <docblock line="120">
-          <description><![CDATA[No params = add, params = edit]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="120" name="param" description="" type="object" variable="$db">
-            <type by_reference="false">object</type>
+          <tag line="94" name="var" description="" type="\GtkLabel">
+            <type by_reference="false">\GtkLabel</type>
           </tag>
         </docblock>
-        <argument line="125">
+      </property>
+      <property final="false" static="false" visibility="protected" line="106" package="Default">
+        <name>$lblconn_db</name>
+        <default><![CDATA[]]></default>
+        <docblock line="101">
+          <description><![CDATA[Label for connection database name]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="101" name="var" description="" type="\Gtklabel">
+            <type by_reference="false">\Gtklabel</type>
+          </tag>
+        </docblock>
+      </property>
+      <property final="false" static="false" visibility="protected" line="113" package="Default">
+        <name>$lbldbtype</name>
+        <default><![CDATA[]]></default>
+        <docblock line="108">
+          <description><![CDATA[Label for database type]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="108" name="var" description="" type="\Gtklabel">
+            <type by_reference="false">\Gtklabel</type>
+          </tag>
+        </docblock>
+      </property>
+      <property final="false" static="false" visibility="protected" line="120" package="Default">
+        <name>$lblhost</name>
+        <default><![CDATA[]]></default>
+        <docblock line="115">
+          <description><![CDATA[Label for database host]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="115" name="var" description="" type="\Gtklabel">
+            <type by_reference="false">\Gtklabel</type>
+          </tag>
+        </docblock>
+      </property>
+      <property final="false" static="false" visibility="protected" line="127" package="Default">
+        <name>$lbluser</name>
+        <default><![CDATA[]]></default>
+        <docblock line="122">
+          <description><![CDATA[Label for database connection user]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="122" name="var" description="" type="\GtkLabel">
+            <type by_reference="false">\GtkLabel</type>
+          </tag>
+        </docblock>
+      </property>
+      <property final="false" static="false" visibility="protected" line="134" package="Default">
+        <name>$lblpass</name>
+        <default><![CDATA[]]></default>
+        <docblock line="129">
+          <description><![CDATA[Label for database connection password]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="129" name="var" description="" type="\GtkLabel">
+            <type by_reference="false">\GtkLabel</type>
+          </tag>
+        </docblock>
+      </property>
+      <property final="false" static="false" visibility="protected" line="141" package="Default">
+        <name>$lbldb_file</name>
+        <default><![CDATA[]]></default>
+        <docblock line="136">
+          <description><![CDATA[Label for database file]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="136" name="var" description="" type="\GtkLabel">
+            <type by_reference="false">\GtkLabel</type>
+          </tag>
+        </docblock>
+      </property>
+      <property final="false" static="false" visibility="protected" line="148" package="Default">
+        <name>$lblport</name>
+        <default><![CDATA[]]></default>
+        <docblock line="143">
+          <description><![CDATA[Label for database connection port]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="143" name="var" description="" type="\GtkLabel">
+            <type by_reference="false">\GtkLabel</type>
+          </tag>
+        </docblock>
+      </property>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="160" package="">
+        <name>__construct</name>
+        <type>function</type>
+        <docblock line="154">
+          <description><![CDATA[No params = add, params = edit]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="154" name="param" description="" type="object" variable="$db">
+            <type by_reference="false">object</type>
+          </tag>
+          <tag line="154" name="return" description="" type="void">
+            <type by_reference="false">void</type>
+          </tag>
+        </docblock>
+        <argument line="160">
           <name>$db</name>
           <default><![CDATA[null]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="211" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="246" package="">
         <name>change_db</name>
         <type>function</type>
-        <docblock line="206">
+        <docblock line="241">
           <description><![CDATA[Set defaults for new database type]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="206" name="return" description="" type="void">
+          <tag line="241" name="return" description="" type="void">
             <type by_reference="false">void</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="280" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="315" package="">
         <name>set_db</name>
         <type>function</type>
-        <docblock line="275">
+        <docblock line="310">
           <description><![CDATA[Like change_db function, but save current values]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="275" name="return" description="" type="void">
-            <type by_reference="false">void</type>
-          </tag>
-        </docblock>
-      </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="325" package="">
-        <name>db_add</name>
-        <type>function</type>
-        <docblock line="320">
-          <description><![CDATA[Adds the database to the settings file]]></description>
-          <long-description><![CDATA[]]></long-description>
-          <tag line="320" name="return" description="" type="void">
+          <tag line="310" name="return" description="" type="void">
             <type by_reference="false">void</type>
           </tag>
         </docblock>
       </method>
       <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="360" package="">
-        <name>db_edit</name>
+        <name>db_add</name>
         <type>function</type>
         <docblock line="355">
-          <description><![CDATA[Edit an existing database connection]]></description>
+          <description><![CDATA[Adds the database to the settings file]]></description>
           <long-description><![CDATA[]]></long-description>
           <tag line="355" name="return" description="" type="void">
             <type by_reference="false">void</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="398" package="">
-        <name>test_conn</name>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="395" package="">
+        <name>db_edit</name>
         <type>function</type>
-        <docblock line="393">
-          <description><![CDATA[Test a db connection, and display a popup with the result of the test]]></description>
+        <docblock line="390">
+          <description><![CDATA[Edit an existing database connection]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="393" name="return" description="" type="void">
+          <tag line="390" name="return" description="" type="void">
             <type by_reference="false">void</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="445" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="433" package="">
+        <name>test_conn</name>
+        <type>function</type>
+        <docblock line="428">
+          <description><![CDATA[Test a db connection, and display a popup with the result of the test]]></description>
+          <long-description><![CDATA[]]></long-description>
+          <tag line="428" name="return" description="" type="void">
+            <type by_reference="false">void</type>
+          </tag>
+        </docblock>
+      </method>
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="480" package="">
         <name>get_available_dbs</name>
         <type>function</type>
-        <docblock line="440">
+        <docblock line="475">
           <description><![CDATA[Checks what database drivers are available]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="440" name="return" description="" type="array">
+          <tag line="475" name="return" description="" type="array">
             <type by_reference="false">array</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="503" package="">
+      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="538" package="">
         <name>_add_row</name>
         <type>function</type>
-        <docblock line="494">
+        <docblock line="529">
           <description><![CDATA[Simple helper function for adding a row to the GtkTable]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="494" name="param" description="" type="string" variable="$label">
+          <tag line="529" name="param" description="" type="string" variable="$label">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="494" name="param" description="" type="string" variable="$vname">
+          <tag line="529" name="param" description="" type="string" variable="$vname">
             <type by_reference="false">string</type>
           </tag>
-          <tag line="494" name="param" description="&amp;$y1" type="int" variable="$y1">
+          <tag line="529" name="param" description="&amp;$y1" type="int" variable="$y1">
             <type by_reference="false">int</type>
           </tag>
-          <tag line="494" name="param" description="&amp;$y2" type="int" variable="$y2">
+          <tag line="529" name="param" description="&amp;$y2" type="int" variable="$y2">
             <type by_reference="false">int</type>
           </tag>
-          <tag line="494" name="return" description="" type="void">
+          <tag line="529" name="return" description="" type="void">
             <type by_reference="false">void</type>
           </tag>
         </docblock>
-        <argument line="503">
+        <argument line="538">
           <name>$label</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="503">
+        <argument line="538">
           <name>$vname</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="503">
+        <argument line="538">
           <name>$y1</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
-        <argument line="503">
+        <argument line="538">
           <name>$y2</name>
           <default><![CDATA[]]></default>
           <type/>
         </argument>
       </method>
-      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="524" package="">
+      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="559" package="">
         <name>_layout</name>
         <type>function</type>
-        <docblock line="519">
+        <docblock line="554">
           <description><![CDATA[Table layout]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="519" name="return" description="" type="void">
+          <tag line="554" name="return" description="" type="void">
             <type by_reference="false">void</type>
           </tag>
         </docblock>
       </method>
     </class>
   </file>
-  <file path="sys/windows/add_db.php" hash="0222fe7979ab77d622703845b11144d3" package="Default">
+  <file path="sys/windows/add_db.php" hash="c8c5c9abe97ce4ec39365cce83553dd1" package="OpenSQLManager">
     <docblock line="2">
       <description><![CDATA[OpenSQLManager]]></description>
       <long-description><![CDATA[<p>Free Database manager for Open Source Databases</p>]]></long-description>
+      <tag line="2" name="package" description="OpenSQLManager"/>
       <tag line="2" name="author" description="Timothy J. Warren"/>
       <tag line="2" name="copyright" description="Copyright (c) 2012"/>
       <tag line="2" name="link" description="https://github.com/aviat4ion/OpenSQLManager" link="https://github.com/aviat4ion/OpenSQLManager"/>
       <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
     </docblock>
-    <class final="false" abstract="false" namespace="default" line="18" package="Default">
+    <class final="false" abstract="false" namespace="default" line="22" package="OpenSQLManager\Windows">
       <name>Add_DB</name>
       <full_name>\Add_DB</full_name>
       <extends>\GtkWindow</extends>
-      <docblock line="15">
+      <docblock line="16">
         <description><![CDATA[Window controlling addition of database connections]]></description>
         <long-description><![CDATA[]]></long-description>
+        <tag line="16" name="package" description="OpenSQLManager"/>
+        <tag line="16" name="subpackage" description="Windows"/>
       </docblock>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="23" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="27" package="">
         <name>__construct</name>
         <type>function</type>
-        <docblock line="20">
+        <docblock line="24">
           <description><![CDATA[Create the window]]></description>
           <long-description><![CDATA[]]></long-description>
         </docblock>
       </method>
     </class>
   </file>
-  <file path="sys/windows/edit_db.php" hash="7ef40e491c07e3732a6b458020182033" package="Default">
+  <file path="sys/windows/edit_db.php" hash="ff91299d790e4be1e709a0a14745e86e" package="OpenSQLManager">
     <docblock line="2">
       <description><![CDATA[OpenSQLManager]]></description>
       <long-description><![CDATA[<p>Free Database manager for Open Source Databases</p>]]></long-description>
+      <tag line="2" name="package" description="OpenSQLManager"/>
       <tag line="2" name="author" description="Timothy J. Warren"/>
       <tag line="2" name="copyright" description="Copyright (c) 2012"/>
       <tag line="2" name="link" description="https://github.com/aviat4ion/OpenSQLManager" link="https://github.com/aviat4ion/OpenSQLManager"/>
       <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
     </docblock>
-    <class final="false" abstract="false" namespace="default" line="18" package="Default">
+    <class final="false" abstract="false" namespace="default" line="22" package="OpenSQLManager\Windows">
       <name>Edit_DB</name>
       <full_name>\Edit_DB</full_name>
       <extends>\GtkWindow</extends>
-      <docblock line="15">
+      <docblock line="16">
         <description><![CDATA[Window controlling modifications of database connections]]></description>
         <long-description><![CDATA[]]></long-description>
+        <tag line="16" name="package" description="OpenSQLManager"/>
+        <tag line="16" name="subpackage" description="Windows"/>
       </docblock>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="25" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="29" package="">
         <name>__construct</name>
         <type>function</type>
-        <docblock line="20">
+        <docblock line="24">
           <description><![CDATA[Connection editing window]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="20" name="param" description="" type="object" variable="$db_params">
+          <tag line="24" name="param" description="" type="object" variable="$db_params">
             <type by_reference="false">object</type>
           </tag>
         </docblock>
-        <argument line="25">
+        <argument line="29">
           <name>$db_params</name>
           <default><![CDATA[]]></default>
           <type/>
@@ -6202,45 +6351,51 @@ the last query executed]]></description>
       </method>
     </class>
   </file>
-  <file path="sys/windows/db_table_data.php" hash="b166e0e3d151a415eec24f68ac4551ad" package="Default">
+  <file path="sys/windows/db_table_data.php" hash="7794ea8f8bcc2b2d2d4c776fbb2572e8" package="OpenSQLManager">
     <docblock line="2">
       <description><![CDATA[OpenSQLManager]]></description>
       <long-description><![CDATA[<p>Free Database manager for Open Source Databases</p>]]></long-description>
+      <tag line="2" name="package" description="OpenSQLManager"/>
       <tag line="2" name="author" description="Timothy J. Warren"/>
       <tag line="2" name="copyright" description="Copyright (c) 2012"/>
       <tag line="2" name="link" description="https://github.com/aviat4ion/OpenSQLManager" link="https://github.com/aviat4ion/OpenSQLManager"/>
       <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
     </docblock>
-    <class final="false" abstract="false" namespace="default" line="18" package="Default">
+    <class final="false" abstract="false" namespace="default" line="22" package="OpenSQLManager\Windows">
       <name>DB_Table_Data</name>
       <full_name>\DB_Table_Data</full_name>
       <extends>\GTKWindow</extends>
-      <docblock line="15">
+      <docblock line="16">
         <description><![CDATA[Popup window to display database table data]]></description>
         <long-description><![CDATA[]]></long-description>
+        <tag line="16" name="package" description="OpenSQLManager"/>
+        <tag line="16" name="subpackage" description="Windows"/>
       </docblock>
-      <property final="false" static="false" visibility="protected" line="23" package="Default">
+      <property final="false" static="false" visibility="protected" line="29" package="Default">
         <name>$win</name>
         <default><![CDATA[]]></default>
-        <docblock line="20">
+        <docblock line="24">
           <description><![CDATA[Reference to the scrolled window]]></description>
           <long-description><![CDATA[]]></long-description>
+          <tag line="24" name="var" description="" type="\GtkScrolledWindow">
+            <type by_reference="false">\GtkScrolledWindow</type>
+          </tag>
         </docblock>
       </property>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="31" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="37" package="">
         <name>__construct</name>
         <type>function</type>
-        <docblock line="25">
+        <docblock line="31">
           <description><![CDATA[Create and populate the window]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="25" name="param" description="" type="array" variable="$data">
+          <tag line="31" name="param" description="" type="array" variable="$data">
             <type by_reference="false">array</type>
           </tag>
-          <tag line="25" name="return" description="" type="void">
+          <tag line="31" name="return" description="" type="void">
             <type by_reference="false">void</type>
           </tag>
         </docblock>
-        <argument line="31">
+        <argument line="37">
           <name>$data</name>
           <default><![CDATA[]]></default>
           <type/>
@@ -6248,188 +6403,198 @@ the last query executed]]></description>
       </method>
     </class>
   </file>
-  <file path="sys/windows/main.php" hash="5281b8239bd465b5768d1c0372d3c79b" package="Default">
+  <file path="sys/windows/main.php" hash="8e05165cf8a7d4ba676df0c7bc01e924" package="OpenSQLManager">
     <docblock line="2">
       <description><![CDATA[OpenSQLManager]]></description>
       <long-description><![CDATA[<p>Free Database manager for Open Source Databases</p>]]></long-description>
+      <tag line="2" name="package" description="OpenSQLManager"/>
       <tag line="2" name="author" description="Timothy J. Warren"/>
       <tag line="2" name="copyright" description="Copyright (c) 2012"/>
       <tag line="2" name="link" description="https://github.com/aviat4ion/OpenSQLManager" link="https://github.com/aviat4ion/OpenSQLManager"/>
       <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
     </docblock>
-    <class final="false" abstract="false" namespace="default" line="20" package="Default">
+    <class final="false" abstract="false" namespace="default" line="24" package="OpenSQLManager\Windows">
       <name>Main</name>
       <full_name>\Main</full_name>
       <extends>\GtkWindow</extends>
-      <docblock line="15">
+      <docblock line="16">
         <description><![CDATA[Main Window Class]]></description>
         <long-description><![CDATA[<p>Creates and displays the main interface window</p>]]></long-description>
+        <tag line="16" name="package" description="OpenSQLManager"/>
+        <tag line="16" name="subpackage" description="Windows"/>
       </docblock>
-      <property final="false" static="false" visibility="private" line="25" package="Default">
+      <property final="false" static="false" visibility="private" line="31" package="Default">
         <name>$settings</name>
         <default><![CDATA[]]></default>
-        <docblock line="22">
+        <docblock line="26">
           <description><![CDATA[Reference to settings instance]]></description>
           <long-description><![CDATA[]]></long-description>
+          <tag line="26" name="var" description="" type="\Settings">
+            <type by_reference="false">\Settings</type>
+          </tag>
         </docblock>
       </property>
-      <property final="false" static="false" visibility="private" line="30" package="Default">
+      <property final="false" static="false" visibility="private" line="38" package="Default">
         <name>$connection_sidebar</name>
         <default><![CDATA[]]></default>
-        <docblock line="27">
+        <docblock line="33">
           <description><![CDATA[Reference to connection sidebar instance]]></description>
           <long-description><![CDATA[]]></long-description>
+          <tag line="33" name="var" description="" type="\Connection_Sidebar">
+            <type by_reference="false">\Connection_Sidebar</type>
+          </tag>
         </docblock>
       </property>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="35" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="43" package="">
         <name>__construct</name>
         <type>function</type>
-        <docblock line="32">
+        <docblock line="40">
           <description><![CDATA[Create and display the main window on startup]]></description>
           <long-description><![CDATA[]]></long-description>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="73" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="81" package="">
         <name>__destruct</name>
         <type>function</type>
-        <docblock line="68">
+        <docblock line="76">
           <description><![CDATA[Some cleanup for when the main window is closed]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="68" name="return" description="" type="void">
+          <tag line="76" name="return" description="" type="void">
             <type by_reference="false">void</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="95" package="">
+      <method final="false" abstract="false" static="false" visibility="public" namespace="default" line="103" package="">
         <name>quit</name>
         <type>function</type>
-        <docblock line="90">
+        <docblock line="98">
           <description><![CDATA[Exits the GTK loop]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="90" name="return" description="" type="void">
+          <tag line="98" name="return" description="" type="void">
             <type by_reference="false">void</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="108" package="">
+      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="116" package="">
         <name>_main_layout</name>
         <type>function</type>
-        <docblock line="102">
+        <docblock line="110">
           <description><![CDATA[Layout the main interface
 Create menus, hboxes, vboxs and other widgets]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="102" name="return" description="" type="void">
+          <tag line="110" name="return" description="" type="void">
             <type by_reference="false">void</type>
           </tag>
         </docblock>
       </method>
-      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="150" package="">
+      <method final="false" abstract="false" static="false" visibility="private" namespace="default" line="158" package="">
         <name>_create_menu</name>
         <type>function</type>
-        <docblock line="145">
+        <docblock line="153">
           <description><![CDATA[Create the menu for the program]]></description>
           <long-description><![CDATA[]]></long-description>
-          <tag line="145" name="return" description="" type="\GtkMenuBar">
+          <tag line="153" name="return" description="" type="\GtkMenuBar">
             <type by_reference="false">\GtkMenuBar</type>
           </tag>
         </docblock>
       </method>
     </class>
   </file>
-  <file path="index.php" hash="31e7100561353444d61d9a06ad415219" package="Default">
+  <file path="index.php" hash="62c60423b369f5d5ba17681a49e93948" package="OpenSQLManager">
     <docblock line="2">
       <description><![CDATA[OpenSQLManager]]></description>
       <long-description><![CDATA[<p>Free Database manager for Open Source Databases</p>]]></long-description>
+      <tag line="2" name="package" description="OpenSQLManager"/>
       <tag line="2" name="author" description="Timothy J. Warren"/>
       <tag line="2" name="copyright" description="Copyright (c) 2012"/>
       <tag line="2" name="link" description="https://github.com/aviat4ion/OpenSQLManager" link="https://github.com/aviat4ion/OpenSQLManager"/>
       <tag line="2" name="license" description="http://philsturgeon.co.uk/code/dbad-license"/>
     </docblock>
-    <include line="126" type="Require Once" package="Default">
+    <include line="127" type="Require Once" package="Default">
       <name>/db/autoload.php</name>
     </include>
-    <constant namespace="default" line="33" package="Default">
+    <constant namespace="default" line="34" package="Default">
       <name>BASE_DIR</name>
       <value><![CDATA[dirname(__FILE__).'/sys']]></value>
     </constant>
-    <constant namespace="default" line="34" package="Default">
+    <constant namespace="default" line="35" package="Default">
       <name>SETTINGS_DIR</name>
       <value><![CDATA[dirname(__FILE__)]]></value>
     </constant>
-    <constant namespace="default" line="35" package="Default">
+    <constant namespace="default" line="36" package="Default">
       <name>PROGRAM_NAME</name>
       <value><![CDATA['OpenSQLManager']]></value>
     </constant>
-    <constant namespace="default" line="36" package="Default">
+    <constant namespace="default" line="37" package="Default">
       <name>VERSION</name>
       <value><![CDATA['0.1.0pre']]></value>
     </constant>
-    <function namespace="default" line="43" package="Default">
+    <function namespace="default" line="44" package="OpenSQLManager">
       <name>log_fatal</name>
       <type>function</type>
-      <docblock line="40">
+      <docblock line="41">
         <description><![CDATA[Log fatal errors]]></description>
         <long-description><![CDATA[]]></long-description>
       </docblock>
     </function>
-    <function namespace="default" line="87" package="Default">
+    <function namespace="default" line="88" package="OpenSQLManager">
       <name>exception_error_handler</name>
       <type>function</type>
-      <docblock line="78">
+      <docblock line="79">
         <description><![CDATA[Error handler to convert errors to exceptions]]></description>
         <long-description><![CDATA[]]></long-description>
-        <tag line="78" name="param" description="" type="int" variable="$errno">
+        <tag line="79" name="param" description="" type="int" variable="$errno">
           <type by_reference="false">int</type>
         </tag>
-        <tag line="78" name="param" description="" type="string" variable="$errstr">
+        <tag line="79" name="param" description="" type="string" variable="$errstr">
           <type by_reference="false">string</type>
         </tag>
-        <tag line="78" name="param" description="" type="string" variable="$errfile">
+        <tag line="79" name="param" description="" type="string" variable="$errfile">
           <type by_reference="false">string</type>
         </tag>
-        <tag line="78" name="param" description="" type="int" variable="$errline">
+        <tag line="79" name="param" description="" type="int" variable="$errline">
           <type by_reference="false">int</type>
         </tag>
-        <tag line="78" name="throws" description="" type="\ErrorException">
+        <tag line="79" name="throws" description="" type="\ErrorException">
           <type by_reference="false">\ErrorException</type>
         </tag>
       </docblock>
-      <argument line="87">
+      <argument line="88">
         <name>$errno</name>
         <default><![CDATA[]]></default>
         <type/>
       </argument>
-      <argument line="87">
+      <argument line="88">
         <name>$errstr</name>
         <default><![CDATA[]]></default>
         <type/>
       </argument>
-      <argument line="87">
+      <argument line="88">
         <name>$errfile</name>
         <default><![CDATA[]]></default>
         <type/>
       </argument>
-      <argument line="87">
+      <argument line="88">
         <name>$errline</name>
         <default><![CDATA[]]></default>
         <type/>
       </argument>
     </function>
-    <function namespace="default" line="107" package="Default">
+    <function namespace="default" line="108" package="OpenSQLManager">
       <name>do_include</name>
       <type>function</type>
-      <docblock line="100">
+      <docblock line="101">
         <description><![CDATA[Bulk directory loading workaround for use
 with array_map and glob]]></description>
         <long-description><![CDATA[]]></long-description>
-        <tag line="100" name="param" description="" type="string" variable="$path">
+        <tag line="101" name="param" description="" type="string" variable="$path">
           <type by_reference="false">string</type>
         </tag>
-        <tag line="100" name="return" description="" type="void">
+        <tag line="101" name="return" description="" type="void">
           <type by_reference="false">void</type>
         </tag>
       </docblock>
-      <argument line="107">
+      <argument line="108">
         <name>$path</name>
         <default><![CDATA[]]></default>
         <type/>
@@ -6438,6 +6603,15 @@ with array_map and glob]]></description>
   </file>
   <package name="" full_name=""/>
   <package name="Default" full_name="Default"/>
+  <package name="OpenSQLManager" full_name="OpenSQLManager">
+    <package name="Widgets" full_name="OpenSQLManager\Widgets"/>
+    <package name="Windows" full_name="OpenSQLManager\Windows"/>
+  </package>
+  <package name="Query" full_name="Query">
+    <package name="Drivers" full_name="Query\Drivers"/>
+    <package name="Helper Classes" full_name="Query\Helper Classes"/>
+    <package name="Query" full_name="Query\Query"/>
+  </package>
   <namespace name="default" full_name="default"/>
   <marker count="0">todo</marker>
   <marker count="0">fixme</marker>
diff --git a/index.php b/index.php
index 8fe30dc..dd970d6 100644
--- a/index.php
+++ b/index.php
@@ -4,6 +4,7 @@
  *
  * Free Database manager for Open Source Databases
  *
+ * @package		OpenSQLManager
  * @author 		Timothy J. Warren
  * @copyright	Copyright (c) 2012
  * @link 		https://github.com/aviat4ion/OpenSQLManager
diff --git a/sys/common/functions.php b/sys/common/functions.php
index 827a5a8..4764ac7 100644
--- a/sys/common/functions.php
+++ b/sys/common/functions.php
@@ -4,6 +4,7 @@
  *
  * Free Database manager for Open Source Databases
  *
+ * @package		OpenSQLManager
  * @author 		Timothy J. Warren
  * @copyright	Copyright (c) 2012
  * @link 		https://github.com/aviat4ion/OpenSQLManager
diff --git a/sys/db b/sys/db
index cf4c031..62a7eaf 160000
--- a/sys/db
+++ b/sys/db
@@ -1 +1 @@
-Subproject commit cf4c03177a3b6f5e788c622aa8d15fa92ebce116
+Subproject commit 62a7eaf73dd460564c27497e111ae9b2dbcbfbb4
diff --git a/sys/widgets/connection_sidebar.php b/sys/widgets/connection_sidebar.php
index 51cbc56..19dc27f 100644
--- a/sys/widgets/connection_sidebar.php
+++ b/sys/widgets/connection_sidebar.php
@@ -4,6 +4,7 @@
  *
  * Free Database manager for Open Source Databases
  *
+ * @package		OpenSQLManager
  * @author 		Timothy J. Warren
  * @copyright	Copyright (c) 2012
  * @link 		https://github.com/aviat4ion/OpenSQLManager
@@ -14,6 +15,9 @@
 
 /**
  * Widget managing saved database connections
+ *
+ * @package OpenSQLManager
+ * @subpackage Widgets
  */
 class Connection_Sidebar extends GtkVBox {
 
diff --git a/sys/widgets/data_grid.php b/sys/widgets/data_grid.php
index 5342a37..6413636 100644
--- a/sys/widgets/data_grid.php
+++ b/sys/widgets/data_grid.php
@@ -4,6 +4,7 @@
  *
  * Free Database manager for Open Source Databases
  *
+ * @package		OpenSQLManager
  * @author 		Timothy J. Warren
  * @copyright	Copyright (c) 2012
  * @link 		https://github.com/aviat4ion/OpenSQLManager
@@ -13,7 +14,10 @@
 // --------------------------------------------------------------------------
 
 /**
- *Class to simplify dealing with GtkTreeView
+ * Class to simplify dealing with GtkTreeView
+ *
+ * @package OpenSQLManager
+ * @subpackage Widgets
  */
 class Data_Grid extends GtkTreeView {
 
diff --git a/sys/widgets/db_info_widget.php b/sys/widgets/db_info_widget.php
index f6790ce..13182ca 100644
--- a/sys/widgets/db_info_widget.php
+++ b/sys/widgets/db_info_widget.php
@@ -4,6 +4,7 @@
  *
  * Free Database manager for Open Source Databases
  *
+ * @package		OpenSQLManager
  * @author 		Timothy J. Warren
  * @copyright	Copyright (c) 2012
  * @link 		https://github.com/aviat4ion/OpenSQLManager
@@ -14,6 +15,9 @@
 
 /**
  * Widget for adding / editing database connections
+ *
+ * @package OpenSQLManager
+ * @subpackage Widgets
  */
 class DB_Info_Widget extends GtkTable {
 
diff --git a/sys/widgets/db_tabs.php b/sys/widgets/db_tabs.php
index 3780182..e820d87 100644
--- a/sys/widgets/db_tabs.php
+++ b/sys/widgets/db_tabs.php
@@ -4,6 +4,7 @@
  *
  * Free Database manager for Open Source Databases
  *
+ * @package		OpenSQLManager
  * @author 		Timothy J. Warren
  * @copyright	Copyright (c) 2012
  * @link 		https://github.com/aviat4ion/OpenSQLManager
@@ -14,6 +15,9 @@
 
 /**
  * Tabbed Container for database properties
+ *
+ * @package OpenSQLManager
+ * @subpackage Widgets
  */
 class DB_tabs extends GTKNotebook {
 
diff --git a/sys/windows/add_db.php b/sys/windows/add_db.php
index b5a4f67..1266664 100644
--- a/sys/windows/add_db.php
+++ b/sys/windows/add_db.php
@@ -4,6 +4,7 @@
  *
  * Free Database manager for Open Source Databases
  *
+ * @package		OpenSQLManager
  * @author 		Timothy J. Warren
  * @copyright	Copyright (c) 2012
  * @link 		https://github.com/aviat4ion/OpenSQLManager
@@ -14,6 +15,9 @@
 
 /**
  * Window controlling addition of database connections
+ *
+ * @package OpenSQLManager
+ * @subpackage Windows
  */
 class Add_DB extends GtkWindow {
 
diff --git a/sys/windows/db_table_data.php b/sys/windows/db_table_data.php
index 6179a62..7a07c6b 100644
--- a/sys/windows/db_table_data.php
+++ b/sys/windows/db_table_data.php
@@ -4,6 +4,7 @@
  *
  * Free Database manager for Open Source Databases
  *
+ * @package		OpenSQLManager
  * @author 		Timothy J. Warren
  * @copyright	Copyright (c) 2012
  * @link 		https://github.com/aviat4ion/OpenSQLManager
@@ -14,6 +15,9 @@
 
 /**
  * Popup window to display database table data
+ *
+ * @package OpenSQLManager
+ * @subpackage Windows
  */
 class DB_Table_Data extends GTKWindow {
 
diff --git a/sys/windows/edit_db.php b/sys/windows/edit_db.php
index 589cee7..d526f48 100644
--- a/sys/windows/edit_db.php
+++ b/sys/windows/edit_db.php
@@ -4,6 +4,7 @@
  *
  * Free Database manager for Open Source Databases
  *
+ * @package		OpenSQLManager
  * @author 		Timothy J. Warren
  * @copyright	Copyright (c) 2012
  * @link 		https://github.com/aviat4ion/OpenSQLManager
@@ -14,6 +15,9 @@
 
 /**
  * Window controlling modifications of database connections
+ *
+ * @package OpenSQLManager
+ * @subpackage Windows
  */
 class Edit_DB extends GtkWindow {
 
diff --git a/sys/windows/main.php b/sys/windows/main.php
index 99fb906..977d3df 100644
--- a/sys/windows/main.php
+++ b/sys/windows/main.php
@@ -4,6 +4,7 @@
  *
  * Free Database manager for Open Source Databases
  *
+ * @package		OpenSQLManager
  * @author 		Timothy J. Warren
  * @copyright	Copyright (c) 2012
  * @link 		https://github.com/aviat4ion/OpenSQLManager
@@ -16,6 +17,9 @@
  * Main Window Class
  *
  * Creates and displays the main interface window
+ *
+ * @package OpenSQLManager
+ * @subpackage Windows
  */
 class Main extends GtkWindow {
 
diff --git a/tests/index.php b/tests/index.php
index 6e8ae61..439a129 100644
--- a/tests/index.php
+++ b/tests/index.php
@@ -4,6 +4,7 @@
  *
  * Free Database manager for Open Source Databases
  *
+ * @package		OpenSQLManager
  * @author 		Timothy J. Warren
  * @copyright	Copyright (c) 2012
  * @link 		https://github.com/aviat4ion/OpenSQLManager