diff --git a/lib/Doctrine/Cache.php b/lib/Doctrine/Cache.php
index 2479e3fe0..fb7e5a377 100644
--- a/lib/Doctrine/Cache.php
+++ b/lib/Doctrine/Cache.php
@@ -37,8 +37,8 @@ class Doctrine_Cache extends Doctrine_Db_EventListener implements Countable, Ite
      */
     protected $_options = array('size'              => 1000,
                                 'lifeTime'          => 3600,
-                                'statsSlamDefense'  => 0.75,
-                                'saveSlamDefense'   => 0.80,
+                                'statsPropability'  => 0.75,
+                                'savePropability'   => 0.80,
                                 'cleanPropability'  => 0.98,
                                 'statsFile'         => '../data/stats.cache',
                                 );
diff --git a/lib/Doctrine/Column.php b/lib/Doctrine/Column.php
new file mode 100644
index 000000000..48488fd3e
--- /dev/null
+++ b/lib/Doctrine/Column.php
@@ -0,0 +1,92 @@
+<?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_Column
+ * This class represents a database column
+ *
+ * @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_Column extends Doctrine_Access implements IteratorAggregate, Countable
+{
+    /**
+     * @var array $definition
+     */
+    protected $_definition = array(
+                                'type',
+                                'length' => 0,
+                                );
+    /**
+     * @var array $definition
+     */
+    public function __construct(array $definition = array())
+    {
+        $this->_definition = $definition;
+    }
+    /**
+     * get
+     *
+     * @param string $name
+     * @return mixed
+     */
+    public function get($name)
+    {
+        if ( ! isset($this->_definition[$name])) {
+            return null;
+        }
+        
+        return $this->_definition[$name];
+    }
+    /**
+     * set
+     *
+     * @param string $name
+     * @return mixed
+     */
+    public function set($name, $value)
+    {
+        $this->_definition[$name] = $value;
+    }
+    /**
+     * count
+     *
+     * @return integer
+     */
+    public function count()
+    {
+        return count($this->_definition);
+    }
+    /**
+     * getIterator
+     *
+     * @return ArrayIterator
+     */
+    public function getIterator() 
+    {
+        return new ArrayIterator($this->_definition);
+    }
+
+}