diff --git a/lib/Doctrine/Validator/Driver.php b/lib/Doctrine/Validator/Driver.php
new file mode 100644
index 000000000..7199be853
--- /dev/null
+++ b/lib/Doctrine/Validator/Driver.php
@@ -0,0 +1,118 @@
+<?php
+/*
+ *  $Id: Notnull.php 1080 2007-02-10 18:17:08Z romanb $
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.phpdoctrine.com>.
+ */
+
+/**
+ * Doctrine_Validator_Driver
+ *
+ * @package     Doctrine
+ * @category    Object Relational Mapping
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.phpdoctrine.com
+ * @since       1.0
+ * @version     $Revision: 1080 $
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ */
+class Doctrine_Validator_Driver
+{
+    /**
+     * @var array $_args     an array of plugin specific args
+     */
+    protected $_args = array();
+    /**
+     * __get
+     * an alias for getOption
+     *
+     * @param string $arg
+     */
+    public function __get($arg)
+    {
+        if (isset($this->_args[$arg])) {
+            return $this->_args[$arg];
+        }
+        return null;
+    }
+    /**
+     * __isset
+     *
+     * @param string $arg
+     */
+    public function __isset($arg)
+    {
+        return isset($this->_args[$arg]);
+    }
+    /**
+     * sets given value to an argument
+     *
+     * @param $arg          the name of the option to be changed
+     * @param $value        the value of the option
+     * @return Doctrine_Validator_Driver    this object
+     */
+    public function __set($arg, $value)
+    {
+        if ( ! isset($this->_args[$arg])) {
+            throw new Doctrine_Plugin_Exception('Unknown argument ' . $arg);
+        }
+
+        $this->_args[$arg] = $value;
+        
+        return $this;
+    }
+    /**
+     * returns the value of an argument
+     *
+     * @param $arg          the name of the option to retrieve
+     * @return mixed        the value of the option
+     */
+    public function getArg($arg)
+    {
+        if ( ! isset($this->_args[$arg])) {
+            throw new Doctrine_Plugin_Exception('Unknown option ' . $arg);
+        }
+        
+        return $this->_args[$arg];
+    }
+    /**
+     * sets given value to an argument
+     *
+     * @param $arg          the name of the option to be changed
+     * @param $value        the value of the option
+     * @return Doctrine_Validator_Driver    this object
+     */
+    public function setArg($arg, $value)
+    {
+        if ( ! isset($this->_args[$arg])) {
+            throw new Doctrine_Plugin_Exception('Unknown argument ' . $arg);
+        }
+
+        $this->_args[$arg] = $value;
+        
+        return $this;
+    }
+    /**
+     * returns all args and their associated values
+     *
+     * @return array    all args as an associative array
+     */
+    public function getArgs()
+    {
+        return $this->_args;
+    }
+}
diff --git a/lib/Doctrine/Validator/Interface.class.php b/lib/Doctrine/Validator/Interface.class.php
deleted file mode 100644
index ec5521561..000000000
--- a/lib/Doctrine/Validator/Interface.class.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-interface Doctrine_Validator_Interface {
-    public function validate();
-}