diff --git a/lib/Doctrine/Search.php b/lib/Doctrine/Search.php
index 939718c8c..42a1f29d6 100644
--- a/lib/Doctrine/Search.php
+++ b/lib/Doctrine/Search.php
@@ -32,7 +32,54 @@
  */
 class Doctrine_Search
 {
+    public function buildDefinition(Doctrine_Record $record)
+    {
 
+        $columns = array('keyword'  => array('type'    => 'string',
+                                             'length'  => 200,
+                                             'notnull' => true),
+                         'field'    => array('type'    => 'string',
+                                             'length'  => 50,
+                                             'notnull' => true),
+                         'position' => array('type'    => 'integer',
+                                             'length'  => 8));
+
+        $id = $record->getTable()->getIdentifier();
+        $name = $record->getTable()->getComponentName();
+
+        $options = array('className' => $name . 'Index');
+
+
+        $fk = array();
+        foreach ((array) $id as $column) {
+            $def = $record->getTable()->getDefinitionOf($column);
+
+            unset($def['autoincrement']);
+            unset($def['sequence']);
+            unset($def['primary']);
+
+            $col = strtolower($name . '_' . $column);
+
+            $fk[$col] = $def;
+        }
+        
+        $local = (count($fk) > 1) ? array_keys($fk) : key($fk);
+        
+        $relations = array($name => array('local' => $local,
+                                          'foreign' => $id, 
+                                          'onDelete' => 'CASCADE',
+                                          'onUpdate' => 'CASCADE'));
+
+
+        $columns += $fk;
+
+        $builder = new Doctrine_Import_Builder();
+
+        $def = $builder->buildDefinition($options, $columns, $relations);
+    
+        print "<pre>";
+        print_r($def);
+    }
 }
 /**
 fields:
diff --git a/lib/Doctrine/Search/Analyzer.php b/lib/Doctrine/Search/Analyzer.php
new file mode 100644
index 000000000..a4d30bceb
--- /dev/null
+++ b/lib/Doctrine/Search/Analyzer.php
@@ -0,0 +1,39 @@
+<?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_Search_Analyzer
+ *
+ * @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_Search_Analyzer implements Doctrine_Search_Analyzer_Interface
+{
+    public function analyze($text)
+    {
+    
+    }
+}
diff --git a/lib/Doctrine/Search/Analyzer/Interface.php b/lib/Doctrine/Search/Analyzer/Interface.php
new file mode 100644
index 000000000..696e891e6
--- /dev/null
+++ b/lib/Doctrine/Search/Analyzer/Interface.php
@@ -0,0 +1,36 @@
+<?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_Search_Analyzer_Interface
+ *
+ * @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
+ */
+interface Doctrine_Search_Analyzer_Interface
+{
+    public function analyze($text);
+}
diff --git a/lib/Doctrine/Search/Listener.php b/lib/Doctrine/Search/Listener.php
new file mode 100644
index 000000000..38cf09e43
--- /dev/null
+++ b/lib/Doctrine/Search/Listener.php
@@ -0,0 +1,54 @@
+<?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_Search_Listener
+ *
+ * @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_Search_Listener extends Doctrine_Record_Listener 
+{
+    public function preUpdate(Doctrine_Event $event)
+    { 
+    
+    }
+
+    public function postUpdate(Doctrine_Event $event)
+    { 
+    
+    }
+
+    public function preInsert(Doctrine_Event $event)
+    { 
+
+    }
+
+    public function postInsert(Doctrine_Event $event)
+    { 
+        
+    }
+}
diff --git a/lib/Doctrine/Search/Record.php b/lib/Doctrine/Search/Record.php
index b7da128d9..28684965c 100644
--- a/lib/Doctrine/Search/Record.php
+++ b/lib/Doctrine/Search/Record.php
@@ -36,11 +36,12 @@ class Doctrine_Search_Record extends Doctrine_Template
     {
         $this->hasColumn('keyword', 'string', 250, array('notnull' => true));
         $this->hasColumn('field', 'string', 50, array('notnull' => true));
-        $this->hasColumn('[component]_id', 'string', 50, array('notnull' => true));
         $this->hasColumn('position', 'integer', 8);
+        // depending on the identifiers of the owner record this record 
+        // has also one to many foreign key columns
     }
     public function setUp()
     {
-        $this->hasOne('[component]', array('local' => '[component]_id'));
+        $this->hasOne('[Component]', array('onDelete' => 'CASCADE'));
     }
 }
diff --git a/lib/Doctrine/Search/Template.php b/lib/Doctrine/Search/Template.php
new file mode 100644
index 000000000..730f6fbd2
--- /dev/null
+++ b/lib/Doctrine/Search/Template.php
@@ -0,0 +1,50 @@
+<?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_Search_Template
+ *
+ * @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_Search_Template extends Doctrine_Template
+{     
+    public function setUp()
+    {
+        $id = $record->getTable()->getIdentifier();
+        $name = $record->getTable()->getComponentName() . 'Index';
+
+        foreach ((array) $id as $column) {
+            $foreign[] = strtolower($name . '_' . $column);
+        }
+
+        $foreign = (count($foreign) > 1) ? array_keys($foreign) : key($foreign);
+
+        $this->hasMany($name, array('local' => $id, 'foreign' => $foreign));
+        
+        $this->addListener(new Doctrine_Search_Listener());
+    }
+}