diff --git a/lib/Doctrine/Plugin.php b/lib/Doctrine/Plugin.php
new file mode 100644
index 000000000..03c71e862
--- /dev/null
+++ b/lib/Doctrine/Plugin.php
@@ -0,0 +1,79 @@
+<?php
+/*
+ *  $Id$
+ *
+ * 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_Plugin
+ *
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @package     Doctrine
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @version     $Revision$
+ * @category    Object Relational Mapping
+ * @link        www.phpdoctrine.com
+ * @since       1.0
+ */
+class Doctrine_Plugin 
+{
+    /**
+     * @var array $_options     an array of plugin specific options
+     */
+    protected $_options = array();
+    /**
+     * returns the value of an option
+     *
+     * @param $option       the name of the option to retrieve
+     * @return mixed        the value of the option
+     */
+    public function getOption($name)
+    {
+        if ( ! isset($this->_options[$name])) {
+            throw new Doctrine_Plugin_Exception('Unknown option ' . $name);
+        }
+        
+        return $this->_options[$name];
+    }
+    /**
+     * sets given value to an option
+     *
+     * @param $option       the name of the option to be changed
+     * @param $value        the value of the option
+     * @return Doctrine_Plugin  this object
+     */
+    public function setOption($name, $value)
+    {
+        if ( ! isset($this->_options[$name])) {
+            throw new Doctrine_Plugin_Exception('Unknown option ' . $name);
+        }
+
+        $this->_options[$name] = $value;
+        
+        return $this;
+    }
+    /**
+     * returns all options and their associated values
+     *
+     * @return array    all options as an associative array
+     */
+    public function getOptions()
+    {
+        return $this->_options;	
+    }
+}
diff --git a/lib/Doctrine/Template/Searchable.php b/lib/Doctrine/Template/Searchable.php
index 26d1f8e52..25c289953 100644
--- a/lib/Doctrine/Template/Searchable.php
+++ b/lib/Doctrine/Template/Searchable.php
@@ -40,12 +40,15 @@ class Doctrine_Template_Searchable extends Doctrine_Template
     }
     public function setUp()
     {
-        $this->_search->buildDefinition($this->_table);
-
         $id = $this->_table->getIdentifier();
-        $name = $this->_table->getComponentName() . 'Index';
+        $name = $this->_table->getComponentName();
+        $className = $this->_search->getOption('className');
 
-        $this->_search->setOption('className', $name);
+        if (strpos($className, '%CLASS%') !== false) {
+            $this->_search->setOption('className', str_replace('%CLASS%', $name, $className));
+            $className = $this->_search->getOption('className');
+        }
+        $this->_search->buildDefinition($this->_table);
 
         foreach ((array) $id as $column) {
             $foreign[] = strtolower($this->_table->getComponentName() . '_' . $column);
@@ -53,7 +56,7 @@ class Doctrine_Template_Searchable extends Doctrine_Template
 
         $foreign = (count($foreign) > 1) ? $foreign : current($foreign);
 
-        $this->hasMany($name, array('local' => $id, 'foreign' => $foreign));
+        $this->hasMany($className, array('local' => $id, 'foreign' => $foreign));
 
         $this->addListener(new Doctrine_Search_Listener($this->_search));
     }