--- GenericDb.php.old	2008-07-21 11:05:33.000000000 +0100
+++ GenericDb.php	2008-07-21 11:05:44.000000000 +0100
@@ -41,7 +41,7 @@
 	public function __construct(&$dsn, $options = array())
 	{
 		if (is_object($dsn)) {
-			if ($dsn instanceof MDB2) {
+			if ($dsn instanceof MDB2 || $dsn instanceof MDB2_Driver_Common) {
 				$this->_db = &$dsn;
 			} else {
 				throw new Exception('PHPOF2_Audit_GenericDb was passed an object which was not an MDB2 object in the "dsn" parameter');

--- DB.php.old	2008-07-21 10:35:14.000000000 +0100
+++ DB.php	2008-07-21 11:03:38.000000000 +0100
@@ -41,7 +41,7 @@
 	{
 		// Options that are specific to PHPOF2_DB and are not to be passed to MDB2
 		// (MDB2 throws errors if it gets options it doesn't know about)
-		$private_option_list = array('audit_driver');
+		$private_option_list = array('audit_driver', 'audit_driver_options');
 		$private_options = array();
 		if (is_array($options)) {
 			foreach ($options as $key => $val) {
@@ -70,11 +70,22 @@
 		}
 		
 		// Enable audit driver if required
-		if (isset($private_options['audit_driver'])) {
-			if (!$private_options['audit_driver'] instanceof PHPOF2_Audit_Interface) {
+		if (isset($private_options['audit_driver'])) {		
+			// If the driver is a string try and load the class
+			if (is_string($private_options['audit_driver'])) {
+				$driver = $private_options['audit_driver'];
+				if (isset($private_options['audit_driver_options'])) {
+					$mdb2->phpof2_auditor = new $driver($mdb2, $private_options['audit_driver_options']);
+				} else {
+					$mdb2->phpof2_auditor = new $driver($mdb2);
+				}
+			} else {
+				$mdb2->phpof2_auditor = $private_options['audit_driver'];
+			}
+			
+			if (!$mdb2->phpof2_auditor instanceof PHPOF2_Audit_Interface) {
 				throw new Exception("Audit driver passed to PHPOF2_DB is not a PHPOF2_Audit_Interface object");
 			}
-			$mdb2->phpof2_auditor = $private_options['audit_driver'];
 		}
 		return $mdb2;
 	}

--- DBRow/Audited.php.old	2008-07-21 15:16:12.000000000 +0100
+++ DBRow/Audited.php	2008-07-21 15:17:15.000000000 +0100
@@ -83,6 +83,8 @@
 	{
 		if ($this->skip_audit) return;
 		
+		if (!isset($this->db->phpof2_auditor)) return;
+		
 		$changes = $this->getChanges();
 		
 		if ($this->audit_owner === null) {

--- README.txt.old	2008-07-21 15:22:04.000000000 +0100
+++ README.txt	2008-07-21 17:14:55.000000000 +0100
@@ -51,8 +51,22 @@
 $db_options = array('audit_driver' => $audit_driver);
 $db = PHPOF2_DB::factory($dsn, $db_options);
 
+OR
+
+<?php
+require_once 'PHPOF2/DB.php';
+require_once 'PHPOF2/Audit/GenericDb.php';
+
+// The DSN to the main application database
+$dsn = 'mysqli://foo:password@foohost/somedb';
+
+$db = PHPOF2_DB::factory($dsn, array('audit_driver' => 'PHPOF2_Audit_GenericDb'));
+
 class widgets extends PHPOF2_DBTable {
-	protected $audit_logging = true;
+	protected $default_row_class = 'widget';
+}
+
+class widget extends PHPOF2_DBRow_Audited {
 }
 
 $widgets = new widgets($db, 'widgets');