diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9945af7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+tests/_reports
+vendor
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..ea03129
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,17 @@
+language: php
+
+php:
+    - 5.3
+    - 5.4
+    - 5.5
+    - hhvm
+
+before_script:
+  - composer self-update
+  - composer install --dev
+
+script: phpunit
+
+matrix:
+  allow_failures:
+    - php: hhvm
diff --git a/README.md b/README.md
index cd7286f..c94800c 100644
--- a/README.md
+++ b/README.md
@@ -2,15 +2,17 @@
 
 This library provides a service that can be used to filter object values based on annotations
 
-## Installation
+## Install
 
-### Composer
+Use composer to add DMS\Filter to your app
 
-    composer.phar require dms/dms-filter=~1.1
+`composer require dms/dms-filter:~2.0`
+
+This will get you the latest compatible version with 2.0 without BC breaks.
 
 ## Usage
 
-Your Entity:  
+Your Entity:
 
 ```php
 <?php
@@ -43,7 +45,7 @@ class User
 
 }
 ?>
-```  
+```
 
 Filtering:
 
@@ -75,7 +77,7 @@ Filtering:
     echo $user->name; //"My name"
     echo $user->email; //"email@mail.com"
 ?>
-```  
+```
 
 Full example: https://gist.github.com/1098352
 
@@ -83,7 +85,7 @@ Full example: https://gist.github.com/1098352
 
 This package relies on these external libraries:
 
-* Doctrine Common: Reader and Cache
+* Doctrine Annotations
 
 ## Contributing
 
@@ -92,12 +94,11 @@ Feel free to send pull requests, just follow these guides:
 * Fork
 * Code
 * Test
-    * Tests are in: https://github.com/rdohms/DMS
-    * Just create Testcase and run `phpunit` inside the `tests` folder
+    * Just create FilterTestCase and run `phpunit`
 * Submit PR
 
 ## Credits
 
-This library is inspired by the Symfony 2 Validator component and is meant to work alongside it. 
+This library is inspired by the Symfony 2 Validator component and is meant to work alongside it.
 
 Symfony 2 Validator: https://github.com/symfony/symfony/blob/master/src/Symfony/Component/Validator
diff --git a/Rules/StripNewlines.php b/Rules/StripNewlines.php
deleted file mode 100644
index 71efbab..0000000
--- a/Rules/StripNewlines.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-namespace DMS\Filter\Rules;
-
-/**
- * StripNewlines Rule
- * 
- * @package DMS
- * @subpackage Filter
- * 
- * @Annotation
- */
-class StripNewlines extends Rule
-{
-    /**
-     * {@inheritDoc}
-     */
-    public function applyFilter($value)
-    {
-        return str_replace(array("\n", "\r"), '', $value);
-    }
-
-}
\ No newline at end of file
diff --git a/Rules/ToLower.php b/Rules/ToLower.php
deleted file mode 100644
index aa82cda..0000000
--- a/Rules/ToLower.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-namespace DMS\Filter\Rules;
-
-use DMS\Filter\Exception\FilterException;
-
-/**
- * ToLower Rule
- * 
- * @package DMS
- * @subpackage Filter
- * 
- * @Annotation
- */
-class ToLower extends Rule
-{
-    /**
-     * Encoding to be used
-     * 
-     * @var string
-     */
-    public $encoding = null;
-    
-    /**
-     * {@inheritDoc}
-     */
-    public function applyFilter($value)
-    {
-        if ($this->useEncoding()) {
-            return mb_strtolower((string) $value, $this->encoding);
-        }
-
-        return strtolower((string) $value);
-    }
-
-    /**
-     * Verify is encoding is set and if we have the proper
-     * function to use it
-     * 
-     * @return boolean
-     */
-    public function useEncoding()
-    {
-        if ($this->encoding === null) {
-            return false;
-        }
-        
-        if (!function_exists('mb_strtolower')) {
-            throw new FilterException(
-                'mbstring is required to use ToLower with an encoding.');
-        }
-
-        $this->encoding = (string) $this->encoding;
-        $encodings = array_map('strtolower', mb_list_encodings());
-        
-        if (!in_array(strtolower($this->encoding), $encodings)) {
-            throw new FilterException(
-                "mbstring does not support the '".$this->encoding."' encoding"
-            );
-        }
-
-        return true;
-    }
-     
-    /**
-     * {@inheritDoc}
-     */
-    public function getDefaultOption()
-    {
-        return 'encoding';
-    }
-}
\ No newline at end of file
diff --git a/Rules/ToUpper.php b/Rules/ToUpper.php
deleted file mode 100644
index e272f4c..0000000
--- a/Rules/ToUpper.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-namespace DMS\Filter\Rules;
-
-use DMS\Filter\Exception\FilterException;
-
-/**
- * ToUpper Rule
- * 
- * @package DMS
- * @subpackage Filter
- * 
- * @Annotation
- */
-class ToUpper extends Rule
-{
-    /**
-     * Encoding to be used
-     * 
-     * @var string
-     */
-    public $encoding = null;
-    
-    /**
-     * {@inheritDoc}
-     */
-    public function applyFilter($value)
-    {
-        if ($this->useEncoding()) {
-            return mb_strtoupper((string) $value, $this->encoding);
-        }
-
-        return strtoupper((string) $value);
-    }
-
-    /**
-     * Verify is encoding is set and if we have the proper
-     * function to use it
-     * 
-     * @return boolean
-     */
-    public function useEncoding()
-    {
-        if ($this->encoding === null) {
-            return false;
-        }
-        
-        if (!function_exists('mb_strtoupper')) {
-            throw new FilterException(
-                'mbstring is required to use ToLower with an encoding.');
-        }
-
-        $this->encoding = (string) $this->encoding;
-        $encodings = array_map('strtolower', mb_list_encodings());
-        
-        if (!in_array(strtolower($this->encoding), $encodings)) {
-            throw new FilterException(
-                "mbstring does not support the '".$this->encoding."' encoding"
-            );
-        }
-
-        return true;
-    }
-    
-    /**
-     * {@inheritDoc}
-     */
-    public function getDefaultOption()
-    {
-        return 'encoding';
-    }
-}
\ No newline at end of file
diff --git a/Rules/Trim.php b/Rules/Trim.php
deleted file mode 100644
index f5f8e25..0000000
--- a/Rules/Trim.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-namespace DMS\Filter\Rules;
-
-/**
- * Trim Rule
- * 
- * @package DMS
- * @subpackage Filter
- * 
- * @Annotation
- */
-class Trim extends Rule
-{
-    /**
-     * Comma separated string of allowed tags
-     * 
-     * @var string
-     */
-    public $charlist = null;
-    
-    /**
-     * {@inheritDoc}
-     */
-    public function applyFilter($value)
-    {
-        //trim() only operates in default mode
-        //if no second argument is passed, it
-        //cannot be passed as null
-        if ($this->charlist === null) {
-            return trim($value);
-        }
-        
-        return trim($value, $this->charlist);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getDefaultOption()
-    {
-        return 'charlist';
-    }
-}
\ No newline at end of file
diff --git a/Version.php b/Version.php
deleted file mode 100644
index 6080472..0000000
--- a/Version.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace DMS\Filter;
-
-/**
- * Holds version information for the Filter package
- * 
- * @package DMS
- * @subpackage Filter
- */
-class Version
-{
-    const VERSION = "0.1-DEV";
-    
-    /**
-     * Compares a version with the current one.
-     *
-     * @param string $version Version to compare.
-     * @return int Returns -1 if older, 0 if it is the same, 1 if version 
-     *             passed as argument is newer.
-     */
-    public static function compare($version)
-    {
-        $currentVersion = str_replace(' ', '', strtolower(self::VERSION));
-        $version = str_replace(' ', '', $version);
-
-        return version_compare($version, $currentVersion);
-    }
-}
diff --git a/composer.json b/composer.json
index 76b9659..32eef24 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
     "type":        "library",
     "description": "DMS Filter provides Annotation based entity filtering.",
     "keywords":    ["filter", "dms"],
-    "homepage":    "https://github.com/rdohms/DMS-Filter",
+    "homepage":    "https://github.com/rdohms/dms-filter",
     "license":     "MIT",
 
     "authors": [
@@ -15,14 +15,29 @@
 
     "require": {
         "php":  ">=5.3.2",
-        "doctrine/common": ">=2.1"
+        "doctrine/annotations": "~1.1"
     },
 
     "autoload": {
         "psr-0": {
-            "DMS\\Filter": ""
+            "DMS": ["src","tests"]
         }
     },
 
-    "target-dir": "DMS/Filter"
-}
\ No newline at end of file
+    "require-dev": {
+        "phpunit/phpunit": "~3.7",
+        "doctrine/cache": "~1.3",
+        "zendframework/zend-filter": "~2.0"
+    },
+
+    "suggest": {
+        "zendframework/zend-filter": "Use Zend Filters via DMS Filter"
+    },
+
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "https://packages.zendframework.com/"
+        }
+    ]
+}
diff --git a/composer.lock b/composer.lock
new file mode 100644
index 0000000..f8806ce
--- /dev/null
+++ b/composer.lock
@@ -0,0 +1,737 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
+    ],
+    "hash": "b59fba71a7be12c98baa9f68828f0034",
+    "packages": [
+        {
+            "name": "doctrine/annotations",
+            "version": "v1.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/annotations.git",
+                "reference": "40db0c96985aab2822edbc4848b3bd2429e02670"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/annotations/zipball/40db0c96985aab2822edbc4848b3bd2429e02670",
+                "reference": "40db0c96985aab2822edbc4848b3bd2429e02670",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/lexer": "1.*",
+                "php": ">=5.3.2"
+            },
+            "require-dev": {
+                "doctrine/cache": "1.*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Doctrine\\Common\\Annotations\\": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jonathan Wage",
+                    "email": "jonwage@gmail.com",
+                    "homepage": "http://www.jwage.com/",
+                    "role": "Creator"
+                },
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com",
+                    "homepage": "http://www.instaclick.com"
+                },
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Benjamin Eberlei",
+                    "email": "kontakt@beberlei.de"
+                },
+                {
+                    "name": "Johannes M. Schmitt",
+                    "email": "schmittjoh@gmail.com",
+                    "homepage": "http://jmsyst.com",
+                    "role": "Developer of wrapped JMSSerializerBundle"
+                }
+            ],
+            "description": "Docblock Annotations Parser",
+            "homepage": "http://www.doctrine-project.org",
+            "keywords": [
+                "annotations",
+                "docblock",
+                "parser"
+            ],
+            "time": "2013-06-16 21:33:03"
+        },
+        {
+            "name": "doctrine/lexer",
+            "version": "v1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/lexer.git",
+                "reference": "2f708a85bb3aab5d99dab8be435abd73e0b18acb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/2f708a85bb3aab5d99dab8be435abd73e0b18acb",
+                "reference": "2f708a85bb3aab5d99dab8be435abd73e0b18acb",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.2"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Doctrine\\Common\\Lexer\\": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com",
+                    "homepage": "http://www.instaclick.com"
+                },
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com",
+                    "homepage": "http://jmsyst.com",
+                    "role": "Developer of wrapped JMSSerializerBundle"
+                }
+            ],
+            "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.",
+            "homepage": "http://www.doctrine-project.org",
+            "keywords": [
+                "lexer",
+                "parser"
+            ],
+            "time": "2013-01-12 18:59:04"
+        }
+    ],
+    "packages-dev": [
+        {
+            "name": "doctrine/cache",
+            "version": "v1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/cache.git",
+                "reference": "e16d7adf45664a50fa86f515b6d5e7f670130449"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/cache/zipball/e16d7adf45664a50fa86f515b6d5e7f670130449",
+                "reference": "e16d7adf45664a50fa86f515b6d5e7f670130449",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.2"
+            },
+            "conflict": {
+                "doctrine/common": ">2.2,<2.4"
+            },
+            "require-dev": {
+                "phpunit/phpunit": ">=3.7",
+                "satooshi/php-coveralls": "~0.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Doctrine\\Common\\Cache\\": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jonathan Wage",
+                    "email": "jonwage@gmail.com",
+                    "homepage": "http://www.jwage.com/",
+                    "role": "Creator"
+                },
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com",
+                    "homepage": "http://www.instaclick.com"
+                },
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Benjamin Eberlei",
+                    "email": "kontakt@beberlei.de"
+                },
+                {
+                    "name": "Johannes M. Schmitt",
+                    "email": "schmittjoh@gmail.com",
+                    "homepage": "http://jmsyst.com",
+                    "role": "Developer of wrapped JMSSerializerBundle"
+                }
+            ],
+            "description": "Caching library offering an object-oriented API for many cache backends",
+            "homepage": "http://www.doctrine-project.org",
+            "keywords": [
+                "cache",
+                "caching"
+            ],
+            "time": "2013-10-25 19:04:14"
+        },
+        {
+            "name": "phpunit/php-code-coverage",
+            "version": "1.2.13",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "466e7cd2554b4e264c9e3f31216d25ac0e5f3d94"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/466e7cd2554b4e264c9e3f31216d25ac0e5f3d94",
+                "reference": "466e7cd2554b4e264c9e3f31216d25ac0e5f3d94",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "phpunit/php-file-iterator": ">=1.3.0@stable",
+                "phpunit/php-text-template": ">=1.1.1@stable",
+                "phpunit/php-token-stream": ">=1.1.3@stable"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "3.7.*@dev"
+            },
+            "suggest": {
+                "ext-dom": "*",
+                "ext-xdebug": ">=2.0.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "PHP/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+            "keywords": [
+                "coverage",
+                "testing",
+                "xunit"
+            ],
+            "time": "2013-09-10 08:14:32"
+        },
+        {
+            "name": "phpunit/php-file-iterator",
+            "version": "1.3.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+                "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/acd690379117b042d1c8af1fafd61bde001bf6bb",
+                "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "File/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+            "keywords": [
+                "filesystem",
+                "iterator"
+            ],
+            "time": "2013-10-10 15:34:57"
+        },
+        {
+            "name": "phpunit/php-text-template",
+            "version": "1.1.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "5180896f51c5b3648ac946b05f9ec02be78a0b23"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5180896f51c5b3648ac946b05f9ec02be78a0b23",
+                "reference": "5180896f51c5b3648ac946b05f9ec02be78a0b23",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "Text/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "keywords": [
+                "template"
+            ],
+            "time": "2012-10-31 18:15:28"
+        },
+        {
+            "name": "phpunit/php-timer",
+            "version": "1.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/19689d4354b295ee3d8c54b4f42c3efb69cbc17c",
+                "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "PHP/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "keywords": [
+                "timer"
+            ],
+            "time": "2013-08-02 07:42:54"
+        },
+        {
+            "name": "phpunit/php-token-stream",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
+                "reference": "5220af2a7929aa35cf663d97c89ad3d50cf5fa3e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/5220af2a7929aa35cf663d97c89ad3d50cf5fa3e",
+                "reference": "5220af2a7929aa35cf663d97c89ad3d50cf5fa3e",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "PHP/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Wrapper around PHP's tokenizer extension.",
+            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
+            "keywords": [
+                "tokenizer"
+            ],
+            "time": "2013-09-13 04:58:23"
+        },
+        {
+            "name": "phpunit/phpunit",
+            "version": "3.7.29",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit.git",
+                "reference": "faeb2d9f15dc83830d2db5e4c67acf1d68c9b5ac"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/faeb2d9f15dc83830d2db5e4c67acf1d68c9b5ac",
+                "reference": "faeb2d9f15dc83830d2db5e4c67acf1d68c9b5ac",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-pcre": "*",
+                "ext-reflection": "*",
+                "ext-spl": "*",
+                "php": ">=5.3.3",
+                "phpunit/php-code-coverage": "~1.2.1",
+                "phpunit/php-file-iterator": ">=1.3.1",
+                "phpunit/php-text-template": ">=1.1.1",
+                "phpunit/php-timer": ">=1.0.4",
+                "phpunit/phpunit-mock-objects": "~1.2.0",
+                "symfony/yaml": "~2.0"
+            },
+            "require-dev": {
+                "pear-pear/pear": "1.9.4"
+            },
+            "suggest": {
+                "ext-json": "*",
+                "ext-simplexml": "*",
+                "ext-tokenizer": "*",
+                "phpunit/php-invoker": ">=1.1.0,<1.2.0"
+            },
+            "bin": [
+                "composer/bin/phpunit"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.7.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "PHPUnit/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                "",
+                "../../symfony/yaml/"
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "http://www.phpunit.de/",
+            "keywords": [
+                "phpunit",
+                "testing",
+                "xunit"
+            ],
+            "time": "2014-01-15 06:46:38"
+        },
+        {
+            "name": "phpunit/phpunit-mock-objects",
+            "version": "1.2.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
+                "reference": "5794e3c5c5ba0fb037b11d8151add2a07fa82875"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/5794e3c5c5ba0fb037b11d8151add2a07fa82875",
+                "reference": "5794e3c5c5ba0fb037b11d8151add2a07fa82875",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "phpunit/php-text-template": ">=1.1.1@stable"
+            },
+            "suggest": {
+                "ext-soap": "*"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "PHPUnit/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Mock Object library for PHPUnit",
+            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
+            "keywords": [
+                "mock",
+                "xunit"
+            ],
+            "time": "2013-01-13 10:24:48"
+        },
+        {
+            "name": "symfony/yaml",
+            "version": "v2.4.1",
+            "target-dir": "Symfony/Component/Yaml",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/Yaml.git",
+                "reference": "4e1a237fc48145fae114b96458d799746ad89aa0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/Yaml/zipball/4e1a237fc48145fae114b96458d799746ad89aa0",
+                "reference": "4e1a237fc48145fae114b96458d799746ad89aa0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Symfony\\Component\\Yaml\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Yaml Component",
+            "homepage": "http://symfony.com",
+            "time": "2013-12-28 08:12:03"
+        },
+        {
+            "name": "zendframework/zend-filter",
+            "version": "2.2.5",
+            "target-dir": "Zend/Filter",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/Component_ZendFilter.git",
+                "reference": "0dbe1c10822a340a253a99147bb004978915f641"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://packages.zendframework.com/composer/zendframework-zend-filter-0dbe1c10822a340a253a99147bb004978915f641-zip-8a2bc1.zip",
+                "reference": "2.2.5",
+                "shasum": "ba078a81b2b0e194eb3bc27eb2b791ccc00eb6b7"
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "zendframework/zend-stdlib": "self.version"
+            },
+            "require-dev": {
+                "zendframework/zend-crypt": "self.version"
+            },
+            "suggest": {
+                "zendframework/zend-crypt": "Zend\\Crypt component",
+                "zendframework/zend-i18n": "Zend\\I18n component",
+                "zendframework/zend-stdlib": "Zend\\Stdlib component",
+                "zendframework/zend-uri": "Zend\\Uri component for UriNormalize filter",
+                "zendframework/zend-validator": "Zend\\Validator component"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.2-dev",
+                    "dev-develop": "2.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Zend\\Filter\\": ""
+                }
+            },
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "provides a set of commonly needed data filters",
+            "keywords": [
+                "filter",
+                "zf2"
+            ],
+            "support": {
+                "source": "https://github.com/zendframework/Component_ZendFilter/tree/release-2.2.5"
+            },
+            "time": "2013-10-20 06:00:14"
+        },
+        {
+            "name": "zendframework/zend-stdlib",
+            "version": "2.2.5",
+            "target-dir": "Zend/Stdlib",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/Component_ZendStdlib.git",
+                "reference": "f440ecfc828d61d620662a03987c8287e1e4801e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://packages.zendframework.com/composer/zendframework-zend-stdlib-f440ecfc828d61d620662a03987c8287e1e4801e-zip-7e3c9b.zip",
+                "reference": "2.2.5",
+                "shasum": "d142b30e831141bcf5ed77e0d3ebd9356afcf9ce"
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "zendframework/zend-eventmanager": "To support aggregate hydrator usage",
+                "zendframework/zend-servicemanager": "To support hydrator plugin manager usage"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.2-dev",
+                    "dev-develop": "2.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Zend\\Stdlib\\": ""
+                }
+            },
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": " ",
+            "keywords": [
+                "stdlib",
+                "zf2"
+            ],
+            "support": {
+                "source": "https://github.com/zendframework/Component_ZendStdlib/tree/release-2.2.5"
+            },
+            "time": "2013-10-20 06:00:20"
+        }
+    ],
+    "aliases": [
+
+    ],
+    "minimum-stability": "stable",
+    "stability-flags": [
+
+    ],
+    "platform": {
+        "php": ">=5.3.2"
+    },
+    "platform-dev": [
+
+    ]
+}
diff --git a/phpunit.xml b/phpunit.xml
new file mode 100644
index 0000000..83ec053
--- /dev/null
+++ b/phpunit.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<phpunit bootstrap="vendor/autoload.php" colors="true" verbose="true">
+
+    <testsuites>
+        <testsuite name="DMS Filter Suite">
+            <directory>tests/DMS</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist>
+            <directory suffix=".php">src/DMS</directory>
+        </whitelist>
+        <blacklist>
+            <directory>tests</directory>
+            <directory>vendor</directory>
+        </blacklist>
+    </filter>
+
+    <logging>
+        <log type="coverage-html" target="tests/_reports/coverage/" charset="UTF-8" yui="true" highlight="false" lowUpperBound="35" highLowerBound="70"/>
+        <log type="testdox-text" target="tests/_reports/testdox/tests.txt"/>
+        <log type="testdox-html" target="tests/_reports/testdox/tests.html"/>
+    </logging>
+</phpunit>
diff --git a/Exception/FilterException.php b/src/DMS/Filter/Exception/FilterException.php
similarity index 100%
rename from Exception/FilterException.php
rename to src/DMS/Filter/Exception/FilterException.php
diff --git a/src/DMS/Filter/Exception/InvalidCallbackException.php b/src/DMS/Filter/Exception/InvalidCallbackException.php
new file mode 100644
index 0000000..b65806c
--- /dev/null
+++ b/src/DMS/Filter/Exception/InvalidCallbackException.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace DMS\Filter\Exception;
+
+class InvalidCallbackException extends FilterException
+{
+
+}
diff --git a/Exception/InvalidOptionsException.php b/src/DMS/Filter/Exception/InvalidOptionsException.php
similarity index 100%
rename from Exception/InvalidOptionsException.php
rename to src/DMS/Filter/Exception/InvalidOptionsException.php
diff --git a/src/DMS/Filter/Exception/InvalidZendFilterException.php b/src/DMS/Filter/Exception/InvalidZendFilterException.php
new file mode 100644
index 0000000..a3675b3
--- /dev/null
+++ b/src/DMS/Filter/Exception/InvalidZendFilterException.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace DMS\Filter\Exception;
+
+class InvalidZendFilterException extends FilterException
+{
+
+}
diff --git a/Exception/MissingOptionsException.php b/src/DMS/Filter/Exception/MissingOptionsException.php
similarity index 100%
rename from Exception/MissingOptionsException.php
rename to src/DMS/Filter/Exception/MissingOptionsException.php
diff --git a/Exception/RuleDefinitionException.php b/src/DMS/Filter/Exception/RuleDefinitionException.php
similarity index 100%
rename from Exception/RuleDefinitionException.php
rename to src/DMS/Filter/Exception/RuleDefinitionException.php
diff --git a/Exception/RuleOptionsException.php b/src/DMS/Filter/Exception/RuleOptionsException.php
similarity index 91%
rename from Exception/RuleOptionsException.php
rename to src/DMS/Filter/Exception/RuleOptionsException.php
index 6576b87..518b0e8 100644
--- a/Exception/RuleOptionsException.php
+++ b/src/DMS/Filter/Exception/RuleOptionsException.php
@@ -4,7 +4,7 @@
 
 /**
  * Base Exception for errors with rule options
- * 
+ *
  * @package DMS
  * @subpackage Filter
  * @category Exception
@@ -18,9 +18,9 @@ class RuleOptionsException extends FilterException
 
     /**
      * Constructor
-     * 
+     *
      * @param string $message
-     * @param array $options 
+     * @param array $options
      */
     public function __construct($message, array $options)
     {
@@ -31,12 +31,12 @@ public function __construct($message, array $options)
 
     /**
      * Retrieve options that triggered exception
-     * 
+     *
      * @return array
      */
     public function getOptions()
     {
         return $this->options;
-    }    
+    }
 }
 
diff --git a/Filter.php b/src/DMS/Filter/Filter.php
similarity index 55%
rename from Filter.php
rename to src/DMS/Filter/Filter.php
index 6d91532..4e9ab18 100644
--- a/Filter.php
+++ b/src/DMS/Filter/Filter.php
@@ -5,29 +5,45 @@
 /**
  * Filter Object, responsible for retrieving the filtering rules
  * for the object and applying them
- * 
+ *
  * @package DMS
  * @subpackage Filter
- * 
+ *
+ */
+use DMS\Filter\Filters\Loader\FilterLoaderInterface;
+
+/**
+ * Class Filter
+ *
+ * Executor, receives objects that need filtering and executes attached rules.
+ *
+ * @package DMS\Filter
  */
 class Filter implements FilterInterface
 {
     /**
      *
-     * @var Mapping\ClassMetadataFactory 
+     * @var Mapping\ClassMetadataFactory
      */
     protected $metadataFactory;
-    
+
+    /**
+     * @var FilterLoaderInterface
+     */
+    protected $filterLoader;
+
     /**
      * Constructor
-     * 
-     * @param Mapping\ClassMetadataFactory $metadataFactory 
+     *
+     * @param Mapping\ClassMetadataFactory $metadataFactory
+     * @param FilterLoaderInterface $filterLoader
      */
-    public function __construct(Mapping\ClassMetadataFactory $metadataFactory) 
+    public function __construct(Mapping\ClassMetadataFactory $metadataFactory, $filterLoader)
     {
         $this->metadataFactory = $metadataFactory;
+        $this->filterLoader    = $filterLoader;
     }
-    
+
     /**
      * {@inheritDoc}
      */
@@ -43,18 +59,19 @@ public function filterProperty($object, $property)
     {
         $this->walkObject($object, $property);
     }
-    
+
     /**
      * {@inheritDoc}
      */
-    public function filterValue($value, $filter)
+    public function filterValue($value, $rule)
     {
-        
-        if ($filter instanceof Rules\Rule) {
-            return $filter->applyFilter($value);
+
+        if ($rule instanceof Rules\Rule) {
+            $filter = $this->filterLoader->getFilterForRule($rule);
+            return $filter->apply($rule, $value);
         }
-        
-        return $this->walkRuleChain($value, $filter);
+
+        return $this->walkRuleChain($value, $rule);
     }
 
     /**
@@ -64,52 +81,52 @@ public function getMetadataFactory()
     {
         return $this->metadataFactory;
     }
-    
+
     /**
      * Iterates over annotated properties in an object filtering the selected
      * values
-     * 
+     *
      * @param object $object
      * @param string $limitProperty
      */
-    protected function walkObject($object, $limitProperty = null) {
-        
-        if ( $object === null ) {
+    protected function walkObject($object, $limitProperty = null)
+    {
+        if ($object === null) {
             return;
         }
-        
+
         $metadata = $this->metadataFactory->getClassMetadata(get_class($object));
-        
+
         //Get a Object Handler/Walker
-        $walker = new ObjectWalker($object);
-        
+        $walker = new ObjectWalker($object, $this->filterLoader);
+
         //Get all filtered properties or limit with selected
-        $properties = ($limitProperty !== null)? array($limitProperty) : $metadata->getFilteredProperties();
-        
+        $properties = ($limitProperty !== null) ? array($limitProperty) : $metadata->getFilteredProperties();
+
         //Iterate over properties with filters
-        foreach( $properties as $property ) {
-            
+        foreach ($properties as $property) {
+
             $walker->applyFilterRules($property, $metadata->getPropertyRules($property));
-            
+
         }
-        
+
     }
-    
+
     /**
      * Iterates over an array of filters applying all to the value
-     * 
+     *
      * @param mixed $value
-     * @param array $filters
-     * @return mixed 
+     * @param array $rules
+     * @return mixed
      */
-    protected function walkRuleChain($value, $filters)
+    protected function walkRuleChain($value, $rules)
     {
-        
-        foreach($filters as $filter) {
-            $value = $filter->applyFilter($value);
+        foreach ($rules as $rule) {
+            $filter = $this->filterLoader->getFilterForRule($rule);
+            $value = $filter->apply($rule, $value);
         }
-        
+
         return $value;
     }
-    
-}
\ No newline at end of file
+
+}
diff --git a/FilterInterface.php b/src/DMS/Filter/FilterInterface.php
similarity index 88%
rename from FilterInterface.php
rename to src/DMS/Filter/FilterInterface.php
index 9ef5fe9..a614472 100644
--- a/FilterInterface.php
+++ b/src/DMS/Filter/FilterInterface.php
@@ -4,7 +4,7 @@
 
 /**
  * Filters the values of a given object
- * 
+ *
  * @package DMS
  * @subpackage Filter
  */
@@ -13,35 +13,35 @@ interface FilterInterface
     /**
      * Iterates over the properties of the object applying filters and
      * replacing values
-     * 
+     *
      * @param mixed $object
      */
     public function filterEntity($object);
-    
+
     /**
      * Filters a specific property in an object, replacing the current value
-     * 
+     *
      * @param mixed $object
      * @param string $property
      */
     public function filterProperty($object, $property);
 
     /**
-     * Runs a given value through one or more filter rules returning the 
+     * Runs a given value through one or more filter rules returning the
      * filtered value
-     * 
+     *
      * @param mixed $value
      * @param array|Rules\Rule $filter
-     * 
+     *
      * @return mixed
      */
-    public function filterValue($value,  $filter);
-    
+    public function filterValue($value, $filter);
+
     /**
      * Retrieves the metadata factory for class metdatas
-     * 
+     *
      * @return Mapping\ClassMetadataFactoryInterface
      */
     public function getMetadataFactory();
-    
-}
\ No newline at end of file
+
+}
diff --git a/src/DMS/Filter/Filters/Alnum.php b/src/DMS/Filter/Filters/Alnum.php
new file mode 100644
index 0000000..67a2a6b
--- /dev/null
+++ b/src/DMS/Filter/Filters/Alnum.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace DMS\Filter\Filters;
+
+use DMS\Filter\Rules\Rule;
+
+/**
+ * Alnum Filter (Alphanumeric)
+ *
+ * @package DMS
+ * @subpackage Filter
+ */
+class Alnum extends RegExp
+{
+    /**
+     * {@inheritDoc}
+     *
+     * @param \DMS\Filter\Rules\Alnum $rule
+     */
+    public function apply(Rule $rule, $value)
+    {
+        //Check for Whitespace support
+        $whitespaceChar = ($rule->allowWhitespace)? " ":"";
+
+        $rule->unicodePattern = '/[^\p{L}\p{N}' . $whitespaceChar . ']/u';
+        $rule->pattern        = '/[^a-zA-Z0-9' . $whitespaceChar . ']/';
+
+        return parent::apply($rule, $value);
+    }
+}
diff --git a/src/DMS/Filter/Filters/Alpha.php b/src/DMS/Filter/Filters/Alpha.php
new file mode 100644
index 0000000..acb95e9
--- /dev/null
+++ b/src/DMS/Filter/Filters/Alpha.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace DMS\Filter\Filters;
+
+use DMS\Filter\Rules\Rule;
+
+/**
+ * Alpha Filter
+ *
+ * @package DMS
+ * @subpackage Filter
+ */
+class Alpha extends RegExp
+{
+    /**
+     * {@inheritDoc}
+     *
+     * @param \DMS\Filter\Rules\Alpha $rule
+     */
+    public function apply(Rule $rule, $value)
+    {
+        //Check for Whitespace support
+        $whitespaceChar = ($rule->allowWhitespace)? " ":"";
+
+        $rule->unicodePattern = '/[^\p{L}' . $whitespaceChar . ']/u';
+        $rule->pattern        = '/[^a-zA-Z' . $whitespaceChar . ']/';
+
+        return parent::apply($rule, $value);
+    }
+}
diff --git a/src/DMS/Filter/Filters/BaseFilter.php b/src/DMS/Filter/Filters/BaseFilter.php
new file mode 100644
index 0000000..0be8701
--- /dev/null
+++ b/src/DMS/Filter/Filters/BaseFilter.php
@@ -0,0 +1,29 @@
+<?php
+namespace DMS\Filter\Filters;
+
+use DMS\Filter\Rules\Rule;
+
+/**
+ * Base Filter Class
+ *
+ * Abstract class that defined the basic needs of a "Filter"
+ * Filter classes are the enforcers of rules. This means they
+ * are the classes that know how a given rule is applied to
+ * a value.
+ *
+ */
+abstract class BaseFilter
+{
+
+    /**
+     * Enforces the desired filtering on the the value
+     * returning a filtered value.
+     *
+     * @param \DMS\Filter\Rules\Rule $rule
+     * @param mixed $value
+     *
+     * @return mixed
+     */
+    abstract function apply(Rule $rule, $value);
+
+}
diff --git a/src/DMS/Filter/Filters/Boolean.php b/src/DMS/Filter/Filters/Boolean.php
new file mode 100644
index 0000000..24b3cb3
--- /dev/null
+++ b/src/DMS/Filter/Filters/Boolean.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace DMS\Filter\Filters;
+
+use DMS\Filter\Rules\Rule;
+
+/**
+ * Boolean Filter
+ *
+ * @package DMS
+ * @subpackage Filter
+ */
+class Boolean extends BaseFilter
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function apply(Rule $rule, $value)
+    {
+        return (boolean) $value;
+    }
+
+}
diff --git a/src/DMS/Filter/Filters/Callback.php b/src/DMS/Filter/Filters/Callback.php
new file mode 100644
index 0000000..c01073c
--- /dev/null
+++ b/src/DMS/Filter/Filters/Callback.php
@@ -0,0 +1,133 @@
+<?php
+
+namespace DMS\Filter\Filters;
+
+use Closure;
+use DMS\Filter\Exception\FilterException;
+use DMS\Filter\Exception\InvalidCallbackException;
+use DMS\Filter\Rules\Callback as CallbackRule;
+use DMS\Filter\Rules\Rule;
+
+/**
+ * Callback Filter
+ *
+ * @package DMS
+ * @subpackage Filter
+ */
+class Callback extends BaseFilter implements ObjectAwareFilter
+{
+    /**
+     * @var object | null
+     */
+    protected $currentObject = null;
+
+    /**
+     * Set the current object so that the filter can access it
+     *
+     * @param $object
+     * @return object mixed
+     */
+    public function setCurrentObject($object)
+    {
+        $this->currentObject = $object;
+    }
+
+    /**
+     * Retrieves the current Object to be used
+     *
+     * @return object | null
+     */
+    public function getCurrentObject()
+    {
+        return $this->currentObject;
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @param CallbackRule $rule
+     */
+    public function apply(Rule $rule, $value)
+    {
+        $type = $rule->getInputType();
+
+        if ($type == CallbackRule::SELF_METHOD_TYPE) {
+            return $this->useObjectMethod($rule->callback, $value);
+        }
+
+        if ($type == CallbackRule::CALLABLE_TYPE) {
+            return $this->useCallable($rule->callback, $value);
+        }
+
+        if ($type == CallbackRule::CLOSURE_TYPE) {
+            return $this->useClosure($rule->callback, $value);
+        }
+
+        throw new InvalidCallbackException("Unsupported callback provided, failed to filter property");
+    }
+
+    /**
+     * Filters by executing a method in the object
+     *
+     * @param string $method
+     * @param mixed $value
+     * @throws \DMS\Filter\Exception\FilterException
+     * @throws \DMS\Filter\Exception\InvalidCallbackException
+     * @returns mixed
+     */
+    protected function useObjectMethod($method, $value)
+    {
+        $currentObject = $this->getCurrentObject();
+
+        if ($currentObject === null) {
+            throw new FilterException(
+                "The target object was not provided to the filter, can't execute method. Please report this."
+            );
+        }
+
+        if (! method_exists($currentObject, $method)) {
+            throw new InvalidCallbackException(
+                sprintf(
+                    "CallbackFilter: Method '%s' not found in object of type '%s'",
+                    $method,
+                    get_class($currentObject)
+                )
+            );
+        }
+
+        return $currentObject->$method($value);
+    }
+
+    /**
+     * Filters using a callable.
+     *
+     * @param callable $callable
+     * @param mixed $value
+     * @throws \DMS\Filter\Exception\InvalidCallbackException
+     * @return mixed
+     */
+    protected function useCallable($callable, $value)
+    {
+        if (! is_callable($callable, false, $input)) {
+            throw new InvalidCallbackException("The callable $input could not be resolved.");
+        }
+
+        return call_user_func($callable, $value);
+    }
+
+    /**
+     * @param Closure $closure
+     * @param mixed $value
+     * @throws \DMS\Filter\Exception\InvalidCallbackException
+     * @return mixed
+     */
+    protected function useClosure($closure, $value)
+    {
+        if (! $closure instanceof Closure) {
+            throw new InvalidCallbackException("CallbackFilter: the provided closure is invalid");
+        }
+
+        return $closure($value);
+    }
+
+}
diff --git a/src/DMS/Filter/Filters/Digits.php b/src/DMS/Filter/Filters/Digits.php
new file mode 100644
index 0000000..8a1c22c
--- /dev/null
+++ b/src/DMS/Filter/Filters/Digits.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace DMS\Filter\Filters;
+
+use DMS\Filter\Rules\Rule;
+
+/**
+ * Digits Rule
+ *
+ * @package DMS
+ * @subpackage Filter
+ */
+class Digits extends RegExp
+{
+    /**
+     * {@inheritDoc}
+     *
+     * @param \DMS\Filter\Rules\Digits $rule
+     */
+    public function apply(Rule $rule, $value)
+    {
+        //Check for Whitespace support
+        $whitespaceChar = ($rule->allowWhitespace)? " ":"";
+
+        $rule->unicodePattern = '/[^\p{N}' . $whitespaceChar . ']/';
+        $rule->pattern        = '/[^0-9' . $whitespaceChar . ']/';
+
+        return parent::apply($rule, $value);
+    }
+}
diff --git a/Rules/Float.php b/src/DMS/Filter/Filters/Float.php
similarity index 62%
rename from Rules/Float.php
rename to src/DMS/Filter/Filters/Float.php
index c91646d..a1808a8 100644
--- a/Rules/Float.php
+++ b/src/DMS/Filter/Filters/Float.php
@@ -1,28 +1,28 @@
 <?php
 
-namespace DMS\Filter\Rules;
+namespace DMS\Filter\Filters;
+
+use DMS\Filter\Rules\Rule;
 
 /**
- * Float Rule
+ * Float Filter
  * Converts content into a Float
- * 
+ *
  * @package DMS
  * @subpackage Filter
- * 
- * @Annotation
  */
-class Float extends Rule
+class Float extends BaseFilter
 {
     /**
      * {@inheritDoc}
      */
-    public function applyFilter($value)
+    public function apply(Rule $rule, $value)
     {
         if (is_array($value) || is_object($value)) {
             return null;
         }
-        
+
         return floatval($value);
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/DMS/Filter/Filters/HtmlEntities.php b/src/DMS/Filter/Filters/HtmlEntities.php
new file mode 100644
index 0000000..e99d731
--- /dev/null
+++ b/src/DMS/Filter/Filters/HtmlEntities.php
@@ -0,0 +1,24 @@
+<?php
+namespace DMS\Filter\Filters;
+
+use DMS\Filter\Rules\Rule;
+
+/**
+ * Html Entities Filter
+ *
+ * @package DMS
+ * @subpackage Filter
+ */
+class HtmlEntities extends BaseFilter
+{
+    /**
+     * {@inheritDoc}
+     *
+     * @param \DMS\Filter\Rules\HtmlEntities $rule
+     */
+    public function apply(Rule $rule, $value)
+    {
+        return htmlentities($value, $rule->flags, $rule->encoding, $rule->doubleEncode);
+    }
+
+}
diff --git a/src/DMS/Filter/Filters/Int.php b/src/DMS/Filter/Filters/Int.php
new file mode 100644
index 0000000..3242ea8
--- /dev/null
+++ b/src/DMS/Filter/Filters/Int.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace DMS\Filter\Filters;
+
+use DMS\Filter\Rules\Rule;
+
+/**
+ * Int Filter
+ * Converts content into an Int
+ *
+ * @package DMS
+ * @subpackage Filter
+ */
+class Int extends BaseFilter
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function apply(Rule $rule, $value)
+    {
+        return (int) ($value);
+    }
+
+}
diff --git a/src/DMS/Filter/Filters/Loader/FilterLoader.php b/src/DMS/Filter/Filters/Loader/FilterLoader.php
new file mode 100644
index 0000000..f840dab
--- /dev/null
+++ b/src/DMS/Filter/Filters/Loader/FilterLoader.php
@@ -0,0 +1,36 @@
+<?php
+namespace DMS\Filter\Filters\Loader;
+
+use DMS\Filter\Filters\BaseFilter;
+use DMS\Filter\Rules\Rule;
+
+/**
+ * Class FilterLoader
+ *
+ * Loads the filter that enforces a specific rule.
+ *
+ * @package DMS\Filter\Filters\Loader
+ */
+class FilterLoader implements FilterLoaderInterface
+{
+
+    /**
+     * Finds the filter responsible for executing a specific rule
+     *
+     * @param Rule $rule
+     *
+     * @throws \UnexpectedValueException If filter can't be located
+     * @return BaseFilter
+     */
+    public function getFilterForRule(Rule $rule)
+    {
+        $filterIdentifier = $rule->getFilter();
+
+        if (class_exists($filterIdentifier)) {
+            return new $filterIdentifier;
+        }
+
+        $error = "Unable to locate filter for: $filterIdentifier defined in " . get_class($rule);
+        throw new \UnexpectedValueException($error);
+    }
+}
diff --git a/src/DMS/Filter/Filters/Loader/FilterLoaderInterface.php b/src/DMS/Filter/Filters/Loader/FilterLoaderInterface.php
new file mode 100644
index 0000000..1f8a772
--- /dev/null
+++ b/src/DMS/Filter/Filters/Loader/FilterLoaderInterface.php
@@ -0,0 +1,25 @@
+<?php
+namespace DMS\Filter\Filters\Loader;
+
+use DMS\Filter\Filters\BaseFilter;
+use DMS\Filter\Rules\Rule;
+
+/**
+ * Interface FilterLoaderInterface
+ *
+ * Defines the required interface for a loader capable of finding the executor of a specific rule.
+ *
+ * @package DMS\Filter\Filters\Loader
+ */
+interface FilterLoaderInterface
+{
+    /**
+     * Finds the filter responsible for executing a specific rule
+     *
+     * @param Rule $rule
+     *
+     * @throws \UnexpectedValueException If filter can't be located
+     * @return BaseFilter
+     */
+    public function getFilterForRule(Rule $rule);
+}
diff --git a/src/DMS/Filter/Filters/ObjectAwareFilter.php b/src/DMS/Filter/Filters/ObjectAwareFilter.php
new file mode 100644
index 0000000..efe113d
--- /dev/null
+++ b/src/DMS/Filter/Filters/ObjectAwareFilter.php
@@ -0,0 +1,30 @@
+<?php
+
+
+namespace DMS\Filter\Filters;
+
+/**
+ * Interface ObjectAwareFilter
+ *
+ * Allows filters to be aware of the object they are being applied to.
+ *
+ * @package DMS\Filter\Filters
+ */
+interface ObjectAwareFilter
+{
+    /**
+     * Set the current object so that the filter can access it
+     *
+     * @param $object
+     * @return object mixed
+     */
+    public function setCurrentObject($object);
+
+    /**
+     * Retrieves the current Object to be used
+     *
+     * @return object | null
+     */
+    public function getCurrentObject();
+
+}
diff --git a/src/DMS/Filter/Filters/PregReplace.php b/src/DMS/Filter/Filters/PregReplace.php
new file mode 100644
index 0000000..63d4876
--- /dev/null
+++ b/src/DMS/Filter/Filters/PregReplace.php
@@ -0,0 +1,24 @@
+<?php
+namespace DMS\Filter\Filters;
+
+use DMS\Filter\Rules\Rule;
+
+/**
+ * PregReplace Filter
+ *
+ * Replaces based on regular expression, will replace with empty if no
+ * replacement is defined.
+ *
+ * @package DMS
+ * @subpackage Filter
+ */
+class PregReplace extends BaseFilter
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function apply(Rule $rule, $value)
+    {
+        return preg_replace($rule->regexp, $rule->replacement, $value);
+    }
+}
diff --git a/Rules/RegExp.php b/src/DMS/Filter/Filters/RegExp.php
similarity index 62%
rename from Rules/RegExp.php
rename to src/DMS/Filter/Filters/RegExp.php
index 1a4018b..c865343 100644
--- a/Rules/RegExp.php
+++ b/src/DMS/Filter/Filters/RegExp.php
@@ -1,18 +1,18 @@
 <?php
 
-namespace DMS\Filter\Rules;
+namespace DMS\Filter\Filters;
+
+use DMS\Filter\Rules\Rule;
 
 /**
- * RegExp Rule
+ * RegExp Filter
  *
  * Filter using preg_replace and unicode or non-unicode patterns
  *
  * @package DMS
  * @subpackage Filter
- *
- * @Annotation
  */
-class RegExp extends Rule
+class RegExp extends BaseFilter
 {
     /**
      * Defines if Unicode is supported
@@ -21,29 +21,17 @@ class RegExp extends Rule
      */
     protected static $unicodeEnabled;
 
-    /**
-     * Unicode version of Pattern
-     *
-     * @var string
-     */
-    public $unicodePattern;
-
-    /**
-     * Reg Exp Pattern
-     *
-     * @var string
-     */
-    public $pattern;
-
     /**
      * {@inheritDoc}
+     *
+     * @param \DMS\Filter\Rules\RegExp $rule
      */
-    public function applyFilter($value)
+    public function apply(Rule $rule, $value)
     {
         //Build pattern
-        $pattern = ($this->checkUnicodeSupport() && $this->unicodePattern !== null)
-            ? $this->unicodePattern
-            : $this->pattern;
+        $pattern = ($this->checkUnicodeSupport() && $rule->unicodePattern !== null)
+            ? $rule->unicodePattern
+            : $rule->pattern;
 
         return preg_replace($pattern, '', $value);
     }
@@ -61,4 +49,4 @@ public function checkUnicodeSupport()
         return self::$unicodeEnabled;
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/DMS/Filter/Filters/StripNewlines.php b/src/DMS/Filter/Filters/StripNewlines.php
new file mode 100644
index 0000000..0f7c960
--- /dev/null
+++ b/src/DMS/Filter/Filters/StripNewlines.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace DMS\Filter\Filters;
+
+use DMS\Filter\Rules\Rule;
+
+/**
+ * StripNewlines Filter
+ *
+ * @package DMS
+ * @subpackage Filter
+ */
+class StripNewlines extends BaseFilter
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function apply(Rule $rule, $value)
+    {
+        return str_replace(array("\n", "\r"), '', $value);
+    }
+
+}
diff --git a/src/DMS/Filter/Filters/StripTags.php b/src/DMS/Filter/Filters/StripTags.php
new file mode 100644
index 0000000..2af0bed
--- /dev/null
+++ b/src/DMS/Filter/Filters/StripTags.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace DMS\Filter\Filters;
+
+use DMS\Filter\Rules\Rule;
+
+/**
+ * StripTags Filter
+ *
+ * @package DMS
+ * @subpackage Filter
+ */
+class StripTags extends BaseFilter
+{
+    /**
+     * {@inheritDoc}
+     *
+     * @param \DMS\Filter\Rules\StripTags $rule
+     * @param mixed $filter
+     */
+    public function apply(Rule $rule, $value)
+    {
+        return strip_tags($value, $rule->allowed);
+    }
+}
diff --git a/src/DMS/Filter/Filters/ToLower.php b/src/DMS/Filter/Filters/ToLower.php
new file mode 100644
index 0000000..63b17bd
--- /dev/null
+++ b/src/DMS/Filter/Filters/ToLower.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace DMS\Filter\Filters;
+
+use DMS\Filter\Rules\Rule;
+use DMS\Filter\Exception\FilterException;
+
+/**
+ * ToLower Filter
+ *
+ * @package DMS
+ * @subpackage Filter
+ */
+class ToLower extends BaseFilter
+{
+
+    /**
+     * {@inheritDoc}
+     *
+     * @param \DMS\Filter\Rules\ToLower $rule
+     */
+    public function apply(Rule $rule, $value)
+    {
+        if ($this->useEncoding($rule)) {
+            return mb_strtolower((string) $value, $rule->encoding);
+        }
+
+        return strtolower((string) $value);
+    }
+
+    /**
+     * Verify is encoding is set and if we have the proper
+     * function to use it
+     *
+     * @param \DMS\Filter\Rules\ToLower $rule
+     *
+     * @throws \DMS\Filter\Exception\FilterException
+     * @return boolean
+     */
+    public function useEncoding($rule)
+    {
+        if ($rule->encoding === null) {
+            return false;
+        }
+
+        if (! function_exists('mb_strtolower')) {
+            throw new FilterException('mbstring is required to use ToLower with an encoding.');
+        }
+
+        $encodings = array_map('strtolower', mb_list_encodings());
+
+        if (!in_array(strtolower($rule->encoding), $encodings)) {
+            throw new FilterException(
+                "mbstring does not support the '".$rule->encoding."' encoding"
+            );
+        }
+
+        return true;
+    }
+}
diff --git a/src/DMS/Filter/Filters/ToUpper.php b/src/DMS/Filter/Filters/ToUpper.php
new file mode 100644
index 0000000..29a8c76
--- /dev/null
+++ b/src/DMS/Filter/Filters/ToUpper.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace DMS\Filter\Filters;
+
+use DMS\Filter\Rules\Rule;
+use DMS\Filter\Exception\FilterException;
+
+/**
+ * ToUpper Filter
+ *
+ * @package DMS
+ * @subpackage Filter
+ */
+class ToUpper extends BaseFilter
+{
+    /**
+     * {@inheritDoc}
+     *
+     * @param \DMS\Filter\Rules\ToUpper $rule
+     */
+    public function apply(Rule $rule, $value)
+    {
+        if ($this->useEncoding($rule)) {
+            return mb_strtoupper((string) $value, $rule->encoding);
+        }
+
+        return strtoupper((string) $value);
+    }
+
+    /**
+     * Verify is encoding is set and if we have the proper
+     * function to use it
+     *
+     * @param \DMS\Filter\Rules\ToUpper $rule
+     *
+     * @throws \DMS\Filter\Exception\FilterException
+     * @return boolean
+     */
+    public function useEncoding($rule)
+    {
+        if ($rule->encoding === null) {
+            return false;
+        }
+
+        if (!function_exists('mb_strtoupper')) {
+            throw new FilterException(
+                'mbstring is required to use ToLower with an encoding.');
+        }
+
+        $this->encoding = (string) $rule->encoding;
+        $encodings = array_map('strtolower', mb_list_encodings());
+
+        if (!in_array(strtolower($rule->encoding), $encodings)) {
+            throw new FilterException(
+                "mbstring does not support the '".$rule->encoding."' encoding"
+            );
+        }
+
+        return true;
+    }
+}
diff --git a/src/DMS/Filter/Filters/Trim.php b/src/DMS/Filter/Filters/Trim.php
new file mode 100644
index 0000000..a460785
--- /dev/null
+++ b/src/DMS/Filter/Filters/Trim.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace DMS\Filter\Filters;
+
+use DMS\Filter\Rules\Rule;
+
+/**
+ * Trim Filter
+ *
+ * @package DMS
+ * @subpackage Filter
+ */
+class Trim extends BaseFilter
+{
+    /**
+     * {@inheritDoc}
+     *
+     * @param \DMS\Filter\Rules\Trim $rule
+     */
+    public function apply(Rule $rule, $value)
+    {
+        //trim() only operates in default mode
+        //if no second argument is passed, it
+        //cannot be passed as null
+        if ($rule->charlist === null) {
+            return trim($value);
+        }
+
+        return trim($value, $rule->charlist);
+    }
+}
diff --git a/src/DMS/Filter/Filters/Zend.php b/src/DMS/Filter/Filters/Zend.php
new file mode 100644
index 0000000..d815365
--- /dev/null
+++ b/src/DMS/Filter/Filters/Zend.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace DMS\Filter\Filters;
+
+use DMS\Filter\Exception\InvalidZendFilterException;
+use DMS\Filter\Rules\Zend as ZendRule;
+use DMS\Filter\Rules\Rule;
+
+/**
+ * Zend Filter
+ *
+ * Instantiates and runs Zend Filters (from ZF2)
+ *
+ * @package DMS
+ * @subpackage Filter
+ */
+class Zend extends BaseFilter
+{
+    /**
+     * {@inheritDoc}
+     *
+     * @param ZendRule $rule
+     */
+    public function apply(Rule $rule, $value)
+    {
+        return $this->getZendInstance($rule->class, $rule->zendOptions)->filter($value);
+    }
+
+    /**
+     * Instantiates a configured Zend Filter, if it exists
+     *
+     * @param string $class
+     * @param array $options
+     * @return \Zend\Filter\FilterInterface
+     * @throws \DMS\Filter\Exception\InvalidZendFilterException
+     */
+    public function getZendInstance($class, $options)
+    {
+        if (strpos($class, 'Zend\Filter') === false) {
+            $class = "Zend\Filter\\".$class;
+        }
+
+        if (! class_exists($class)) {
+            throw new InvalidZendFilterException("Could not find or autoload: $class");
+        }
+
+        try {
+            new \ReflectionMethod($class, 'setOptions');
+
+            $filter = new $class();
+            $filter->setOptions($options);
+
+            return $filter;
+        } catch (\ReflectionException $e) {
+            return new $class($options);
+        }
+    }
+
+}
diff --git a/Mapping/ClassMetadata.php b/src/DMS/Filter/Mapping/ClassMetadata.php
similarity index 78%
rename from Mapping/ClassMetadata.php
rename to src/DMS/Filter/Mapping/ClassMetadata.php
index d1131d6..27c8e3f 100644
--- a/Mapping/ClassMetadata.php
+++ b/src/DMS/Filter/Mapping/ClassMetadata.php
@@ -2,9 +2,11 @@
 
 namespace DMS\Filter\Mapping;
 
+use DMS\Filter\Rules\Rule;
+
 /**
  * Represents a class that has Annotations
- * 
+ *
  * @package DMS
  * @subpackage Filter
  */
@@ -14,28 +16,28 @@ class ClassMetadata implements ClassMetadataInterface
      * @var string
      */
     public $className;
-    
+
     /**
      * Properties that contain filtering rules
      * @var array
      */
     public $filteredProperties = array();
-    
+
     /**
-     * @var ReflectionClass 
+     * @var \ReflectionClass
      */
     private $reflClass;
-    
+
     /**
      * Constructor
-     * 
-     * @param string $class 
+     *
+     * @param string $class
      */
     public function __construct($class)
     {
         $this->className = $class;
     }
-    
+
     /**
      * {@inheritDoc}
      */
@@ -49,41 +51,41 @@ public function getFilteredProperties()
      */
     public function getPropertyRules($property)
     {
-        if ( ! isset($this->filteredProperties[$property])) return;
-        
+        if (! isset($this->filteredProperties[$property])) {
+            return null;
+        }
+
         return $this->filteredProperties[$property]['rules'];
     }
 
     /**
      * {@inheritDoc}
-     * 
-     * @todo bend this method into calestenics
+     *
+     * @todo bend this method into calesthenics
      */
-    public function mergeRules($metadata)
+    public function mergeRules(ClassMetadataInterface $metadata)
     {
-        foreach ( $metadata->getFilteredProperties() as $property ) {
-            
+        foreach ($metadata->getFilteredProperties() as $property) {
             foreach ($metadata->getPropertyRules($property) as $rule) {
                 $this->addPropertyRule($property, clone $rule);
             }
-            
         }
     }
 
     /**
      * {@inheritDoc}
-     * 
+     *
      * @todo check for duplicate rules
      */
-    public function addPropertyRule($property, $rule) 
+    public function addPropertyRule($property, Rule $rule)
     {
         if (!isset ($this->filteredProperties[$property])) {
             $this->filteredProperties[$property] = array('rules' => array());
         }
-        
+
         $this->filteredProperties[$property]['rules'][] = $rule;
     }
-    
+
     /**
      * {@inheritDoc}
      */
@@ -91,7 +93,7 @@ public function getClassName()
     {
         return $this->className;
     }
-    
+
     /**
      * {@inheritDoc}
      */
@@ -103,9 +105,9 @@ public function getReflectionClass()
 
         return $this->reflClass;
     }
-    
 
 
 
 
-}
\ No newline at end of file
+
+}
diff --git a/Mapping/ClassMetadataFactory.php b/src/DMS/Filter/Mapping/ClassMetadataFactory.php
similarity index 74%
rename from Mapping/ClassMetadataFactory.php
rename to src/DMS/Filter/Mapping/ClassMetadataFactory.php
index 088c21a..b770e54 100644
--- a/Mapping/ClassMetadataFactory.php
+++ b/src/DMS/Filter/Mapping/ClassMetadataFactory.php
@@ -6,154 +6,156 @@
 
 /**
  * Responsible for loading metadata for selected classes
- * 
+ *
  * @package DMS
  * @subpackage Filter
  */
 class ClassMetadataFactory implements ClassMetadataFactoryInterface
 {
     /**
-     * @var Loader\LoaderInterface 
+     * @var Loader\LoaderInterface
      */
     protected $loader;
-    
+
     /**
-     * @var Doctrine\Common\Cache\Cache 
+     * @var \Doctrine\Common\Cache\Cache
      */
     protected $cache;
-    
+
     /**
      * @var array
      */
     protected $parsedClasses = array();
-    
+
     /**
      * Constructor
      * Receives a Loader and a Doctrine Compatible cache instance
-     * 
+     *
      * @param Loader\LoaderInterface $loader
-     * @param Cache $cache 
+     * @param Cache $cache
      */
     public function __construct(Loader\LoaderInterface $loader, Cache $cache = null)
     {
         $this->loader = $loader;
         $this->cache = $cache;
     }
-    
+
     /**
      * {@inheritDoc}
      */
     public function getClassMetadata($class)
     {
-    
+
         $class = ltrim($class, '\\');
-        
+
         //Already parsed
-        if ( $this->isParsed($class) ) {
+        if ($this->isParsed($class)) {
             return $this->getParsedClass($class);
         }
-        
+
         //Check Cache for it
         if ($this->cache !== null && $this->cache->contains($class)) {
-            
+
             $this->setParsedClass($class, $this->cache->fetch($class));
             return $this->getParsedClass($class);
-            
+
         }
-        
+
         //Parse unloaded and uncached class
         return $this->parseClassMetadata($class);
     }
-    
+
     /**
      * Reads class metadata for a new and unparsed class
-     * 
+     *
      * @param string $class
-     * @return ClassMetadata 
+     * @return ClassMetadataInterface
      */
-    private function parseClassMetadata($class) 
+    private function parseClassMetadata($class)
     {
         $metadata = new ClassMetadata($class);
-        
+
         //Load up parent and interfaces
         $this->loadParentMetadata($metadata);
         $this->loadInterfaceMetadata($metadata);
-        
+
         //Load Annotations from Reader
         $this->loader->loadClassMetadata($metadata);
-        
+
         //Store internally
         $this->setParsedClass($class, $metadata);
-        
+
         if ($this->cache !== null) {
             $this->cache->save($class, $metadata);
         }
-        
-        return $metadata;    
+
+        return $metadata;
     }
-    
+
     /**
      * Checks if a class has already been parsed
-     * 
+     *
      * @param string $class
-     * @return booelan 
+     * @return boolean
      */
     private function isParsed($class)
     {
         return isset($this->parsedClasses[$class]);
     }
-    
+
     /**
      * Retrieves data from a class already parsed
-     * 
+     *
      * @param string $class
-     * @return ClassMetadata 
+     * @return ClassMetadataInterface
      */
     private function getParsedClass($class)
     {
-        if ( ! $this->isParsed($class)) return;
-        
+        if (! $this->isParsed($class)) {
+            return null;
+        }
+
         return $this->parsedClasses[$class];
     }
-    
+
     /**
      * Stores data from a parsed class
-     * 
+     *
      * @param string $class
-     * @param ClassMetadata $metadata 
+     * @param ClassMetadataInterface $metadata
      */
-    private function setParsedClass($class, $metadata)
+    private function setParsedClass($class, ClassMetadataInterface $metadata)
     {
         $this->parsedClasses[$class] = $metadata;
     }
-    
+
     /**
      * Checks if the class being parsed has a parent and cascades parsing
      * to its parent
-     * 
-     * @param ClassMetadata $metadata 
+     *
+     * @param ClassMetadataInterface $metadata
      */
-    protected function loadParentMetadata($metadata)
+    protected function loadParentMetadata(ClassMetadataInterface $metadata)
     {
         $parent = $metadata->getReflectionClass()->getParentClass();
-        
+
         if ($parent) {
             $metadata->mergeRules($this->getClassMetadata($parent->getName()));
         }
     }
-    
+
     /**
      * Checks if the object has interfaces and cascades parsing of annotatiosn
      * to all the interfaces
-     * 
-     * @param ClassMetadata $metadata 
+     *
+     * @param ClassMetadataInterface $metadata
      */
-    protected function loadInterfaceMetadata($metadata)
+    protected function loadInterfaceMetadata(ClassMetadataInterface $metadata)
     {
-        foreach( $metadata->getReflectionClass()->getInterfaces() as $interface ) {
-            
+        foreach ($metadata->getReflectionClass()->getInterfaces() as $interface) {
+
             $metadata->mergeRules($this->getClassMetadata($interface->getName()));
-            
+
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Mapping/ClassMetadataFactoryInterface.php b/src/DMS/Filter/Mapping/ClassMetadataFactoryInterface.php
similarity index 100%
rename from Mapping/ClassMetadataFactoryInterface.php
rename to src/DMS/Filter/Mapping/ClassMetadataFactoryInterface.php
diff --git a/Mapping/ClassMetadataInterface.php b/src/DMS/Filter/Mapping/ClassMetadataInterface.php
similarity index 75%
rename from Mapping/ClassMetadataInterface.php
rename to src/DMS/Filter/Mapping/ClassMetadataInterface.php
index 3d51bee..b30c262 100644
--- a/Mapping/ClassMetadataInterface.php
+++ b/src/DMS/Filter/Mapping/ClassMetadataInterface.php
@@ -2,9 +2,12 @@
 
 namespace DMS\Filter\Mapping;
 
+use DMS\Filter\Rules\Rule;
+use ReflectionClass;
+
 /**
  * Method required by a ClassMetadata class
- * 
+ *
  * @package DMS
  * @subpackage Filter
  */
@@ -13,45 +16,45 @@ interface ClassMetadataInterface
     /**
      * Retrieve a list of the object's properties that have filters attached
      * to them
-     * 
+     *
      * @return array
      */
     public function getFilteredProperties();
-    
+
     /**
      * Retrieve s list of filtering rules attached to a property
-     * 
+     *
      * @param string $property
      * @return array
      */
     public function getPropertyRules($property);
-    
+
     /**
      * Merges rules from another metadata object into this one
-     * 
-     * @param ClassMetadata $metadata
+     *
+     * @param ClassMetadataInterface $metadata
      */
-    public function mergeRules($metadata);
-    
+    public function mergeRules(ClassMetadataInterface $metadata);
+
     /**
      * Get name of class represented in this Metadata object
-     * 
-     * @return string 
+     *
+     * @return string
      */
     public function getClassName();
-    
+
     /**
      * Returns a ReflectionClass instance for this class.
      *
      * @return ReflectionClass
      */
     public function getReflectionClass();
-    
+
     /**
      * Adds a new rule to a property
-     * 
+     *
      * @param string $property
-     * @param Rules\Rule $rule 
+     * @param Rule $rule
      */
-    public function addPropertyRule($property, $rule);
-}
\ No newline at end of file
+    public function addPropertyRule($property, Rule $rule);
+}
diff --git a/Mapping/Loader/AnnotationLoader.php b/src/DMS/Filter/Mapping/Loader/AnnotationLoader.php
similarity index 61%
rename from Mapping/Loader/AnnotationLoader.php
rename to src/DMS/Filter/Mapping/Loader/AnnotationLoader.php
index 9e6618b..a167884 100644
--- a/Mapping/Loader/AnnotationLoader.php
+++ b/src/DMS/Filter/Mapping/Loader/AnnotationLoader.php
@@ -2,14 +2,16 @@
 
 namespace DMS\Filter\Mapping\Loader;
 
-use Doctrine\Common\Annotations\Reader,
-    Doctrine\Common\Annotations\AnnotationRegistry,
-    DMS\Filter\Rules,
-    DMS\Filter\Mapping;
+use DMS\Filter\Mapping\ClassMetadataInterface;
+use Doctrine\Common\Annotations\Reader;
+use Doctrine\Common\Annotations\AnnotationRegistry;
+use DMS\Filter\Rules;
+use DMS\Filter\Mapping;
+use ReflectionProperty;
 
 /**
  * Loader that reads filtering data from Annotations
- * 
+ *
  * @package DMS
  * @subpackage Filter
  */
@@ -17,54 +19,53 @@ class AnnotationLoader implements LoaderInterface
 {
     /**
      *
-     * @var Doctrine\Common\Annotations\Reader 
+     * @var Reader
      */
     protected $reader;
-    
+
     /**
      * Constructor
-     * 
-     * @param Doctrine\Common\Annotations\Reader $reader 
+     *
+     * @param Reader $reader
      */
     public function __construct(Reader $reader)
     {
         $this->reader = $reader;
-        
+
         //Register Filter Rules Annotation Namespace
         AnnotationRegistry::registerAutoloadNamespace('DMS\Filter\Rules', __DIR__ . '/../../../../');
-        
+
     }
-    
+
     /**
      * Loads annotations data present in the class, using a Doctrine
      * annotation reader
-     * 
-     * @param ClassMetadata $metadata 
+     *
+     * @param ClassMetadataInterface $metadata
+     * @return bool|void
      */
-    public function loadClassMetadata(Mapping\ClassMetadataInterface $metadata)
+    public function loadClassMetadata(ClassMetadataInterface $metadata)
     {
-        
+
         $reflClass = $metadata->getReflectionClass();
-        
+
         //Iterate over properties to get annotations
-        foreach($reflClass->getProperties() as $property) {
-            
+        foreach ($reflClass->getProperties() as $property) {
+
             $this->readProperty($property, $metadata);
-            
+
         }
-        
+
     }
-    
+
     /**
      * Reads annotations for a selected property in the class
-     * 
+     *
      * @param ReflectionProperty $property
-     * @param ClassMetadata $metadata
+     * @param ClassMetadataInterface $metadata
      */
-    private function readProperty($property, $metadata)
+    private function readProperty(ReflectionProperty $property, ClassMetadataInterface $metadata)
     {
-        $reflClass = $metadata->getReflectionClass();
-        
         // Skip if this property is not from this class
         if ($property->getDeclaringClass()->getName()
             != $metadata->getClassName()
@@ -73,11 +74,13 @@ private function readProperty($property, $metadata)
         }
 
         //Iterate over all annotations
-        foreach($this->reader->getPropertyAnnotations($property) as $rule) {
+        foreach ($this->reader->getPropertyAnnotations($property) as $rule) {
 
             //Skip is its not a rule
-            if ( ! $rule instanceof Rules\Rule ) continue;
-            
+            if (! $rule instanceof Rules\Rule) {
+                continue;
+            }
+
             //Add Rule
             $metadata->addPropertyRule($property->getName(), $rule);
 
@@ -85,4 +88,4 @@ private function readProperty($property, $metadata)
 
     }
 
-}
\ No newline at end of file
+}
diff --git a/Mapping/Loader/LoaderInterface.php b/src/DMS/Filter/Mapping/Loader/LoaderInterface.php
similarity index 55%
rename from Mapping/Loader/LoaderInterface.php
rename to src/DMS/Filter/Mapping/Loader/LoaderInterface.php
index 6791cbe..51fbc94 100644
--- a/Mapping/Loader/LoaderInterface.php
+++ b/src/DMS/Filter/Mapping/Loader/LoaderInterface.php
@@ -2,11 +2,11 @@
 
 namespace DMS\Filter\Mapping\Loader;
 
-use DMS\Filter\Mapping;
+use DMS\Filter\Mapping\ClassMetadataInterface;
 
 /**
  * Interface for a Loader
- * 
+ *
  * @package DMS
  * @subpackage Filter
  */
@@ -15,9 +15,9 @@ interface LoaderInterface
     /**
      * Load a Class Metadata.
      *
-     * @param ClassMetadata $metadata A metadata
+     * @param ClassMetadataInterface $metadata A metadata
      *
      * @return Boolean
      */
-    function loadClassMetadata(Mapping\ClassMetadataInterface $metadata);
-}
\ No newline at end of file
+    public function loadClassMetadata(ClassMetadataInterface $metadata);
+}
diff --git a/ObjectWalker.php b/src/DMS/Filter/ObjectWalker.php
similarity index 59%
rename from ObjectWalker.php
rename to src/DMS/Filter/ObjectWalker.php
index 0cd7a24..4f6bad6 100644
--- a/ObjectWalker.php
+++ b/src/DMS/Filter/ObjectWalker.php
@@ -2,10 +2,13 @@
 
 namespace DMS\Filter;
 
+use DMS\Filter\Filters\Loader\FilterLoaderInterface;
+use DMS\Filter\Filters\ObjectAwareFilter;
+
 /**
  * Walks over the properties of an object applying the filters
  * that were defined for them
- * 
+ *
  * @package DMS
  * @subpackage Filter
  */
@@ -15,88 +18,107 @@ class ObjectWalker
      * @var object
      */
     protected $object;
-    
+
     /**
-     * @var ReflectionClass
+     * @var \ReflectionClass
      */
     protected $reflClass;
 
+    /**
+     * @var FilterLoaderInterface
+     */
+    protected $filterLoader;
+
     /**
      * Constructor
-     * 
-     * @param object $object 
+     *
+     * @param object $object
+     * @param FilterLoaderInterface $filterLoader
      */
-    public function __construct( $object )
+    public function __construct($object, $filterLoader)
     {
-        $this->object = $object;
-        $this->reflClass = new \ReflectionClass($object);
+        $this->object       = $object;
+        $this->reflClass    = new \ReflectionClass($object);
+        $this->filterLoader = $filterLoader;
     }
-    
+
     /**
      * Applies the selected rules to a property in the object
-     * 
+     *
      * @param string $property
-     * @param array $filterRules 
+     * @param array $filterRules
      */
     public function applyFilterRules($property, $filterRules = array())
     {
-        foreach($filterRules as $rule ) {
+        foreach ($filterRules as $rule) {
             $this->applyFilterRule($property, $rule);
         }
     }
-    
+
     /**
      * Applies a Filtering Rule to a property
-     * 
+     *
      * @param string $property
      * @param Rules\Rule $filterRule
+     *
+     * @throws \UnexpectedValueException
      */
-    public function applyFilterRule($property, Rules\Rule $filterRule) 
+    public function applyFilterRule($property, Rules\Rule $filterRule)
     {
-                
+
+        if ($this->filterLoader === null) {
+            throw new \UnexpectedValueException("A FilterLoader must be provided");
+        }
+
         $value = $this->getPropertyValue($property);
-        
-        $filteredValue = $filterRule->applyFilter($value);
-        
+
+        $filter = $this->filterLoader->getFilterForRule($filterRule);
+
+        if ($filter instanceof ObjectAwareFilter) {
+            $filter->setCurrentObject($this->object);
+        }
+
+        $filteredValue = $filter->apply($filterRule, $value);
+
         $this->setPropertyValue($property, $filteredValue);
-        
+
     }
-    
+
     /**
      * Retrieves the value of the property, overcoming visibility problems
-     * 
-     * @param string $property
-     * @return mixed 
+     *
+     * @param string $propertyName
+     * @return mixed
      */
     private function getPropertyValue($propertyName)
     {
         return $this->getAccessibleReflectionProperty($propertyName)
                ->getValue($this->object);
     }
-    
+
     /**
      * Overrides the value of a property, overcoming visibility problems
-     * 
-     * @param string $property
-     * @param mixed $value 
+     *
+     * @param string$propertyName
+     * @param mixed $value
      */
     private function setPropertyValue($propertyName, $value)
     {
         $this->getAccessibleReflectionProperty($propertyName)
         ->setValue($this->object, $value);
     }
-    
+
     /**
      * Retrieves a property from the object and makes it visible
-     * 
+     *
      * @param string $propertyName
-     * @return ReflectionProperty 
+     * @return \ReflectionProperty
      */
     private function getAccessibleReflectionProperty($propertyName)
     {
         $property = $this->reflClass->getProperty($propertyName);
         $property->setAccessible(true);
-        
+
         return $property;
     }
-}
\ No newline at end of file
+}
diff --git a/Rules/Alnum.php b/src/DMS/Filter/Rules/Alnum.php
similarity index 50%
rename from Rules/Alnum.php
rename to src/DMS/Filter/Rules/Alnum.php
index 5087ca4..74581e9 100644
--- a/Rules/Alnum.php
+++ b/src/DMS/Filter/Rules/Alnum.php
@@ -20,20 +20,6 @@ class Alnum extends RegExp
      */
     public $allowWhitespace = true;
 
-    /**
-     * {@inheritDoc}
-     */
-    public function applyFilter($value)
-    {
-        //Check for Whitespace support
-        $whitespaceChar = ($this->allowWhitespace)? " ":"";
-
-        $this->unicodePattern = '/[^\p{L}\p{N}' . $whitespaceChar . ']/u';
-        $this->pattern        = '/[^a-zA-Z0-9' . $whitespaceChar . ']/';
-
-        return parent::applyFilter($value);
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -42,4 +28,4 @@ public function getDefaultOption()
         return 'allowWhitespace';
     }
 
-}
\ No newline at end of file
+}
diff --git a/Rules/Alpha.php b/src/DMS/Filter/Rules/Alpha.php
similarity index 50%
rename from Rules/Alpha.php
rename to src/DMS/Filter/Rules/Alpha.php
index fd829fd..d9c90c6 100644
--- a/Rules/Alpha.php
+++ b/src/DMS/Filter/Rules/Alpha.php
@@ -20,20 +20,6 @@ class Alpha extends RegExp
      */
     public $allowWhitespace = true;
 
-    /**
-     * {@inheritDoc}
-     */
-    public function applyFilter($value)
-    {
-        //Check for Whitespace support
-        $whitespaceChar = ($this->allowWhitespace)? " ":"";
-
-        $this->unicodePattern = '/[^\p{L}' . $whitespaceChar . ']/u';
-        $this->pattern        = '/[^a-zA-Z' . $whitespaceChar . ']/';
-
-        return parent::applyFilter($value);
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -42,4 +28,4 @@ public function getDefaultOption()
         return 'allowWhitespace';
     }
 
-}
\ No newline at end of file
+}
diff --git a/Rules/Boolean.php b/src/DMS/Filter/Rules/Boolean.php
similarity index 52%
rename from Rules/Boolean.php
rename to src/DMS/Filter/Rules/Boolean.php
index c9a8423..526c474 100644
--- a/Rules/Boolean.php
+++ b/src/DMS/Filter/Rules/Boolean.php
@@ -4,20 +4,13 @@
 
 /**
  * Boolean Rule
- * 
+ *
  * @package DMS
  * @subpackage Filter
- * 
+ *
  * @Annotation
  */
 class Boolean extends Rule
 {
-    /**
-     * {@inheritDoc}
-     */
-    public function applyFilter($value)
-    {
-        return (boolean) $value;
-    }
 
-}
\ No newline at end of file
+}
diff --git a/src/DMS/Filter/Rules/Callback.php b/src/DMS/Filter/Rules/Callback.php
new file mode 100644
index 0000000..3ecc21b
--- /dev/null
+++ b/src/DMS/Filter/Rules/Callback.php
@@ -0,0 +1,60 @@
+<?php
+namespace DMS\Filter\Rules;
+
+use Closure;
+use DMS\Filter\Exception\InvalidCallbackException;
+
+/**
+ * Callback Rule
+ *
+ * @Annotation
+ */
+class Callback extends Rule
+{
+    const SELF_METHOD_TYPE = 'self_method';
+    const CALLABLE_TYPE    = 'callable';
+    const CLOSURE_TYPE     = 'closure';
+
+    /**
+     * Callback, can be:
+     * - string: method of filtered object or function
+     * - array: [Class, Method] to be called
+     * - Closure
+     *
+     * @var string
+     */
+    public $callback = null;
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getDefaultOption()
+    {
+        return 'callback';
+    }
+
+    /**
+     * Figures out which type of input was provided
+     *
+     * @return string
+     * @throws \DMS\Filter\Exception\InvalidCallbackException
+     */
+    public function getInputType()
+    {
+        switch (true) {
+            case $this->callback instanceof Closure:
+                return self::CLOSURE_TYPE;
+
+            case is_callable($this->callback, false):
+                return self::CALLABLE_TYPE;
+
+            case is_string($this->callback):
+                return self::SELF_METHOD_TYPE;
+        }
+
+        throw new InvalidCallbackException(
+            "The input provided for Callback filter is not supported or the callable not valid.
+            Please refer to the class documentation."
+        );
+    }
+}
diff --git a/Rules/Digits.php b/src/DMS/Filter/Rules/Digits.php
similarity index 50%
rename from Rules/Digits.php
rename to src/DMS/Filter/Rules/Digits.php
index 115d23c..991af85 100644
--- a/Rules/Digits.php
+++ b/src/DMS/Filter/Rules/Digits.php
@@ -20,20 +20,6 @@ class Digits extends RegExp
      */
     public $allowWhitespace = true;
 
-    /**
-     * {@inheritDoc}
-     */
-    public function applyFilter($value)
-    {
-        //Check for Whitespace support
-        $whitespaceChar = ($this->allowWhitespace)? " ":"";
-
-        $this->unicodePattern = '/[^\p{N}' . $whitespaceChar . ']/';
-        $this->pattern        = '/[^0-9' . $whitespaceChar . ']/';
-
-        return parent::applyFilter($value);
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -42,4 +28,4 @@ public function getDefaultOption()
         return 'allowWhitespace';
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/DMS/Filter/Rules/Float.php b/src/DMS/Filter/Rules/Float.php
new file mode 100644
index 0000000..947fd7a
--- /dev/null
+++ b/src/DMS/Filter/Rules/Float.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace DMS\Filter\Rules;
+
+/**
+ * Float Rule
+ * Converts content into a Float
+ *
+ * @package DMS
+ * @subpackage Filter
+ *
+ * @Annotation
+ */
+class Float extends Rule
+{
+
+}
diff --git a/Rules/HtmlEntities.php b/src/DMS/Filter/Rules/HtmlEntities.php
similarity index 71%
rename from Rules/HtmlEntities.php
rename to src/DMS/Filter/Rules/HtmlEntities.php
index 8d68083..64af464 100644
--- a/Rules/HtmlEntities.php
+++ b/src/DMS/Filter/Rules/HtmlEntities.php
@@ -32,12 +32,4 @@ class HtmlEntities extends Rule
      */
     public $doubleEncode = true;
 
-    /**
-     * {@inheritDoc}
-     */
-    public function applyFilter($value)
-    {
-        return htmlentities($value, $this->flags, $this->encoding, $this->doubleEncode);
-    }
-
-}
\ No newline at end of file
+}
diff --git a/Rules/Int.php b/src/DMS/Filter/Rules/Int.php
similarity index 58%
rename from Rules/Int.php
rename to src/DMS/Filter/Rules/Int.php
index e70875d..34f2b1e 100644
--- a/Rules/Int.php
+++ b/src/DMS/Filter/Rules/Int.php
@@ -13,12 +13,5 @@
  */
 class Int extends Rule
 {
-    /**
-     * {@inheritDoc}
-     */
-    public function applyFilter($value)
-    {
-        return (int) ($value);
-    }
 
-}
\ No newline at end of file
+}
diff --git a/Rules/PregReplace.php b/src/DMS/Filter/Rules/PregReplace.php
similarity index 77%
rename from Rules/PregReplace.php
rename to src/DMS/Filter/Rules/PregReplace.php
index 5af3435..e178565 100644
--- a/Rules/PregReplace.php
+++ b/src/DMS/Filter/Rules/PregReplace.php
@@ -27,14 +27,6 @@ class PregReplace extends Rule
      */
     public $replacement = "";
 
-    /**
-     * {@inheritDoc}
-     */
-    public function applyFilter($value)
-    {
-        return preg_replace($this->regexp, $this->replacement, $value);
-    }
-
     /**
      * {@inheritDoc}
      */
diff --git a/src/DMS/Filter/Rules/RegExp.php b/src/DMS/Filter/Rules/RegExp.php
new file mode 100644
index 0000000..fac340a
--- /dev/null
+++ b/src/DMS/Filter/Rules/RegExp.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace DMS\Filter\Rules;
+
+/**
+ * RegExp Rule
+ *
+ * Filter using preg_replace and unicode or non-unicode patterns
+ *
+ * @package DMS
+ * @subpackage Filter
+ *
+ * @Annotation
+ */
+class RegExp extends Rule
+{
+    /**
+     * Unicode version of Pattern
+     *
+     * @var string
+     */
+    public $unicodePattern;
+
+    /**
+     * Reg Exp Pattern
+     *
+     * @var string
+     */
+    public $pattern;
+
+}
diff --git a/Rules/Rule.php b/src/DMS/Filter/Rules/Rule.php
similarity index 69%
rename from Rules/Rule.php
rename to src/DMS/Filter/Rules/Rule.php
index c6829fe..00e9a5f 100644
--- a/Rules/Rule.php
+++ b/src/DMS/Filter/Rules/Rule.php
@@ -2,32 +2,24 @@
 
 namespace DMS\Filter\Rules;
 
-use DMS\Filter\Exception\InvalidOptionsException,
-    DMS\Filter\Exception\MissingOptionsException,
-    DMS\Filter\Exception\RuleDefinitionException;
+use DMS\Filter\Exception\InvalidOptionsException;
+use DMS\Filter\Exception\MissingOptionsException;
+use DMS\Filter\Exception\RuleDefinitionException;
 
 /**
  * Base class for a Filtering Rule, it implements common behaviour
- * 
+ *
+ * Rules are classes that define the metadata supported by
+ * each filter and are used to annotate objects.
+ *
  * @package DMS
  * @subpackage Filter
  * @category Rule
- * 
+ *
  */
 abstract class Rule
 {
-    
     /**
-     * Applies actual filter rule to the value and returns the filtered
-     * value to be replaced in the original object
-     * 
-     * @param mixed $value
-     * @return mixed
-     */
-    abstract function applyFilter($value);
-    
-    /**
-     * 
      * Initializes the filter rule with its options
      *
      * @param mixed $options The options (as associative array)
@@ -38,112 +30,118 @@ abstract function applyFilter($value);
      *                                       options
      * @throws MissingOptionsException       When you don't pass any of the options
      *                                       returned by getRequiredOptions()
-     * @throws ConstraintDefinitionException When you don't pass an associative
-     *                                       array, but getDefaultOption() returns
-     *                                       NULL
      */
     public function __construct($options = null)
     {
-        
+
         $result = $this->parseOptions($options);
-        
+
         if (count($result->invalidOptions) > 0) {
             throw new InvalidOptionsException(
-                sprintf('The options "%s" do not exist in rule %s', implode('", "', $result->invalidOptions), get_class($this)),
+                sprintf(
+                    'The options "%s" do not exist in rule %s',
+                    implode('", "', $result->invalidOptions),
+                    get_class($this)
+                ),
                 $result->invalidOptions
             );
         }
 
         if (count($result->missingOptions) > 0) {
             throw new MissingOptionsException(
-                sprintf('The options "%s" must be set for rule %s', implode('", "', array_keys($result->missingOptions)), get_class($this)),
+                sprintf(
+                    'The options "%s" must be set for rule %s',
+                    implode('", "', array_keys($result->missingOptions)),
+                    get_class($this)
+                ),
                 array_keys($result->missingOptions)
             );
         }
     }
-    
+
     /**
      * Parses provided options into their properties and returns results
      * for the parsing process
-     * 
+     *
      * @param mixed $options
-     * @return \stdClass 
+     * @return \stdClass
      */
     private function parseOptions($options)
     {
         $parseResult = new \stdClass();
         $parseResult->invalidOptions = array();
-        $parseResult->missingOptions = array_flip((array) $this->getRequiredOptions());
-        
+        $parseResult->missingOptions = array_flip((array)$this->getRequiredOptions());
+
         //Doctrine parses constructor parameter into 'value' array param, restore it
         if (is_array($options) && count($options) == 1 && isset($options['value'])) {
             $options = $options['value'];
         }
-        
+
         //Parse Option Array
         if (is_array($options) && count($options) > 0 && is_string(key($options))) {
             $this->parseOptionsArray($options, $parseResult);
             return $parseResult;
         }
-        
+
         //Parse Single Value
         if (null !== $options && ! (is_array($options) && count($options) === 0)) {
             $this->parseSingleOption($options, $parseResult);
             return $parseResult;
         }
-        
+
         return $parseResult;
     }
-    
+
     /**
      * Parses Options in the array format
-     * 
+     *
      * @param array $options
-     * @param \stdClass $result 
+     * @param \stdClass $result
      */
-    private function parseOptionsArray($options, $result)
+    private function parseOptionsArray($options, \stdClass $result)
     {
         foreach ($options as $option => $value) {
-            
-            if (!property_exists($this, $option)) {
+
+            if (! property_exists($this, $option)) {
                 $result->invalidOptions[] = $option;
                 continue;
             }
-            
+
             //Define Option
             $this->$option = $value;
             unset($result->missingOptions[$option]);
         }
     }
-    
+
     /**
      * Parses single option received
-     * 
+     *
      * @param string $options
-     * @param \stdClass $result 
+     * @param \stdClass $result
+     * @throws \DMS\Filter\Exception\RuleDefinitionException
      */
-    private function parseSingleOption($options, $result)
+    private function parseSingleOption($options, \stdClass $result)
     {
         $option = $this->getDefaultOption();
 
-        //No Default set, usnsure what to do
+        //No Default set, unsure what to do
         if (null === $option) {
             throw new RuleDefinitionException(
                 sprintf('No default option is configured for rule %s', get_class($this))
             );
         }
-        
+
         //Default option points to invalid one
-        if (!property_exists($this, $option)) {
+        if (! property_exists($this, $option)) {
             $result->invalidOptions[] = $option;
             return;
         }
-        
+
         //Define Option
         $this->$option = $options;
         unset($result->missingOptions[$option]);
     }
-    
+
     /**
      * Returns the name of the required options
      *
@@ -156,7 +154,7 @@ public function getRequiredOptions()
     {
         return array();
     }
-    
+
     /**
      * Returns the name of the default option
      *
@@ -169,4 +167,16 @@ public function getDefaultOption()
     {
         return null;
     }
+
+    /**
+     * Retrieves the Filter class that is responsible for executing this filter
+     * It may also be a service name. By default it loads a class with the
+     * same name from the Filters namespace.
+     *
+     * @return string
+     */
+    public function getFilter()
+    {
+        return str_replace('Rules', 'Filters', get_class($this));
+    }
 }
diff --git a/src/DMS/Filter/Rules/StripNewlines.php b/src/DMS/Filter/Rules/StripNewlines.php
new file mode 100644
index 0000000..2e6b228
--- /dev/null
+++ b/src/DMS/Filter/Rules/StripNewlines.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace DMS\Filter\Rules;
+
+/**
+ * StripNewlines Rule
+ *
+ * @package DMS
+ * @subpackage Filter
+ *
+ * @Annotation
+ */
+class StripNewlines extends Rule
+{
+}
diff --git a/Rules/StripTags.php b/src/DMS/Filter/Rules/StripTags.php
similarity index 60%
rename from Rules/StripTags.php
rename to src/DMS/Filter/Rules/StripTags.php
index c9556ca..49d8092 100644
--- a/Rules/StripTags.php
+++ b/src/DMS/Filter/Rules/StripTags.php
@@ -4,28 +4,20 @@
 
 /**
  * StripTags Rule
- * 
+ *
  * @package DMS
  * @subpackage Filter
- * 
+ *
  * @Annotation
  */
 class StripTags extends Rule
 {
     /**
-     * Comma separated string of allowed tags
-     * 
+     * String of allowed tags. Ex: <b><i><a>
+     *
      * @var string
      */
     public $allowed = null;
-    
-    /**
-     * {@inheritDoc}
-     */
-    public function applyFilter($value)
-    {
-        return strip_tags($value, $this->allowed);
-    }
 
     /**
      * {@inheritDoc}
@@ -34,4 +26,4 @@ public function getDefaultOption()
     {
         return 'allowed';
     }
-}
\ No newline at end of file
+}
diff --git a/src/DMS/Filter/Rules/ToLower.php b/src/DMS/Filter/Rules/ToLower.php
new file mode 100644
index 0000000..fc5f047
--- /dev/null
+++ b/src/DMS/Filter/Rules/ToLower.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace DMS\Filter\Rules;
+
+/**
+ * ToLower Rule
+ *
+ * @package DMS
+ * @subpackage Filter
+ *
+ * @Annotation
+ */
+class ToLower extends Rule
+{
+    /**
+     * Encoding to be used
+     *
+     * @var string
+     */
+    public $encoding = null;
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getDefaultOption()
+    {
+        return 'encoding';
+    }
+}
diff --git a/src/DMS/Filter/Rules/ToUpper.php b/src/DMS/Filter/Rules/ToUpper.php
new file mode 100644
index 0000000..a2019e2
--- /dev/null
+++ b/src/DMS/Filter/Rules/ToUpper.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace DMS\Filter\Rules;
+
+/**
+ * ToUpper Rule
+ *
+ * @package DMS
+ * @subpackage Filter
+ *
+ * @Annotation
+ */
+class ToUpper extends Rule
+{
+    /**
+     * Encoding to be used
+     *
+     * @var string
+     */
+    public $encoding = null;
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getDefaultOption()
+    {
+        return 'encoding';
+    }
+}
diff --git a/src/DMS/Filter/Rules/Trim.php b/src/DMS/Filter/Rules/Trim.php
new file mode 100644
index 0000000..20ad454
--- /dev/null
+++ b/src/DMS/Filter/Rules/Trim.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace DMS\Filter\Rules;
+
+/**
+ * Trim Rule
+ *
+ * @package DMS
+ * @subpackage Filter
+ *
+ * @Annotation
+ */
+class Trim extends Rule
+{
+    /**
+     * Comma separated string of allowed tags
+     *
+     * @var string
+     */
+    public $charlist = null;
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getDefaultOption()
+    {
+        return 'charlist';
+    }
+}
diff --git a/src/DMS/Filter/Rules/Zend.php b/src/DMS/Filter/Rules/Zend.php
new file mode 100644
index 0000000..a0316c5
--- /dev/null
+++ b/src/DMS/Filter/Rules/Zend.php
@@ -0,0 +1,34 @@
+<?php
+namespace DMS\Filter\Rules;
+
+/**
+ * Zend Rule
+ *
+ * Allows the use for Zend Filters
+ *
+ * @Annotation
+ */
+class Zend extends Rule
+{
+    /**
+     * Zend\Filter class, can be either a FQN or just Boolean for example
+     *
+     * @var string
+     */
+    public $class;
+
+    /**
+     * Array of options to be passed into the Zend Filter
+     *
+     * @var array
+     */
+    public $zendOptions = array();
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getDefaultOption()
+    {
+        return 'class';
+    }
+}
diff --git a/tests/DMS/Filter/FilterTest.php b/tests/DMS/Filter/FilterTest.php
new file mode 100644
index 0000000..2ac1d0b
--- /dev/null
+++ b/tests/DMS/Filter/FilterTest.php
@@ -0,0 +1,121 @@
+<?php
+
+namespace DMS\Filter;
+
+use DMS\Filter\Filters\Loader\FilterLoader;
+use DMS\Tests\FilterTestCase;
+use DMS\Tests\Dummy;
+
+class FilterTest extends FilterTestCase
+{
+    /**
+     * @var \DMS\Filter\Filter
+     */
+    protected $filter;
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->filter = new Filter($this->buildMetadataFactory(), new FilterLoader());
+    }
+
+    public function tearDown()
+    {
+        parent::tearDown();
+    }
+
+    public function testFilter()
+    {
+        $class = new Dummy\Classes\AnnotatedClass();
+        $class->name = "Sir Isaac<script></script> Newton";
+        $class->nickname = "justaname";
+        $class->description = "This is <b>an apple</b>. <p>Isn't it?</p>";
+
+        $classClone = clone $class;
+
+        $this->filter->filterEntity($class);
+
+        $this->assertNotEquals($classClone->name, $class->name);
+        $this->assertEquals($classClone->nickname, $class->nickname);
+        $this->assertNotEquals($classClone->description, $class->description);
+
+        $this->assertNotContains("<script>", $class->name);
+        $this->assertNotContains("<p>", $class->description);
+    }
+
+    public function testFilterWithParent()
+    {
+        $class = new Dummy\Classes\ChildAnnotatedClass();
+        $class->name = "Sir Isaac<script></script> Newton";
+        $class->nickname = "justaname";
+        $class->description = "This is <b>an apple</b>. <p>Isn't it?</p>";
+        $class->surname = " Surname";
+
+        $classClone = clone $class;
+
+        $this->filter->filterEntity($class);
+
+        $this->assertNotEquals($classClone->name, $class->name);
+        $this->assertEquals($classClone->nickname, $class->nickname);
+        $this->assertNotEquals($classClone->description, $class->description);
+        $this->assertNotEquals($classClone->surname, $class->surname);
+
+        $this->assertNotContains("<script>", $class->name);
+        $this->assertNotContains("<p>", $class->description);
+        $this->assertNotContains(" ", $class->surname);
+    }
+
+    public function testFilterProperty()
+    {
+        $class = new Dummy\Classes\AnnotatedClass();
+        $class->name = "Sir Isaac<script></script> Newton";
+        $class->description = "This is <b>an apple</b>. <p>Isn't it?</p>";
+
+        $classClone = clone $class;
+
+        $this->filter->filterProperty($class, 'description');
+
+        $this->assertEquals($classClone->name, $class->name);
+        $this->assertNotEquals($classClone->description, $class->description);
+
+        $this->assertContains("<script>", $class->name);
+        $this->assertNotContains("<p>", $class->description);
+    }
+
+    public function testFilterValue()
+    {
+        $value = "this is <b> a string<p> with<b> tags</p> and malformed";
+
+        $filtered = $this->filter->filterValue($value, new Rules\StripTags());
+
+        $this->assertNotEquals($value, $filtered);
+
+        $this->assertNotContains('<b>', $filtered);
+        $this->assertNotContains('<p>', $filtered);
+    }
+
+    public function testFilterValueWithArray()
+    {
+        $value = "this is <b> a string<p> with<b> tags</p> and\n malformed";
+
+        $filters = array(new Rules\StripTags(), new Rules\StripNewlines());
+        $filtered = $this->filter->filterValue($value, $filters);
+
+        $this->assertNotEquals($value, $filtered);
+
+        $this->assertNotContains('<b>', $filtered);
+        $this->assertNotContains('<p>', $filtered);
+        $this->assertNotContains('\n', $filtered);
+    }
+
+    public function testNotFailOnNull()
+    {
+        $this->filter->filterEntity(null);
+    }
+
+    public function testGetMetadataFactory()
+    {
+        $this->assertInstanceOf('DMS\Filter\Mapping\ClassMetadataFactory', $this->filter->getMetadataFactory());
+    }
+}
diff --git a/tests/DMS/Filter/Filters/AlnumTest.php b/tests/DMS/Filter/Filters/AlnumTest.php
new file mode 100644
index 0000000..61efef3
--- /dev/null
+++ b/tests/DMS/Filter/Filters/AlnumTest.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace DMS\Filter\Filters;
+
+use DMS\Tests\FilterTestCase;
+use DMS\Filter\Rules\Alnum as AlnumRule;
+
+class AlnumTest extends FilterTestCase
+{
+
+    public function setUp()
+    {
+        parent::setUp();
+    }
+
+    public function tearDown()
+    {
+        parent::tearDown();
+    }
+
+    /**
+     * @dataProvider provideForRule
+     */
+    public function testRule($options, $value, $expectedResult, $unicodeSetting = null)
+    {
+        $rule   = new AlnumRule($options);
+        $filter = new Alnum();
+
+        if ($unicodeSetting !== null) {
+
+            $property = new \ReflectionProperty($filter, 'unicodeEnabled');
+            $property->setAccessible(true);
+            $property->setValue($filter, $unicodeSetting);
+
+        }
+
+        $result = $filter->apply($rule, $value);
+
+        $this->assertEquals($expectedResult, $result);
+    }
+
+    public function provideForRule()
+    {
+        return array(
+            array(false, "My Text", "MyText", true),
+            array(false, "My Text", "MyText", false),
+            array(true, "My Text", "My Text", true),
+            array(true, "My Text", "My Text", false),
+            array(true, "My Text!", "My Text", true),
+            array(true, "My Text!", "My Text", false),
+            array(true, "My Text21!", "My Text21", true),
+            array(true, "My Text21!", "My Text21", false),
+            array(true, "João Sorrisão", "João Sorrisão", true),
+            array(true, "João Sorrisão", "Joo Sorriso", false),
+            array(true, "GRΣΣK", "GRΣΣK", true),
+            array(true, "GRΣΣK", "GRK", false),
+            array(true, "Helgi Þormar Þorbjörnsson", "Helgi Þormar Þorbjörnsson", true),
+            array(true, "Helgi Þormar Þorbjörnsson", "Helgi ormar orbjrnsson", false),
+            array(true, "Helgi Þormar!@#$&*( )(*&%$#@Þorbjörnsson", "Helgi Þormar Þorbjörnsson", true),
+            array(true, "Helgi Þormar!@#$&*( )(*&%$#@Þorbjörnsson", "Helgi ormar orbjrnsson", false),
+        );
+    }
+}
diff --git a/tests/DMS/Filter/Filters/AlphaTest.php b/tests/DMS/Filter/Filters/AlphaTest.php
new file mode 100644
index 0000000..8fc403d
--- /dev/null
+++ b/tests/DMS/Filter/Filters/AlphaTest.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace DMS\Filter\Filters;
+
+use DMS\Tests\FilterTestCase;
+use DMS\Filter\Rules\Alpha as AlphaRule;
+
+class AlphaTest extends FilterTestCase
+{
+
+    public function setUp()
+    {
+        parent::setUp();
+    }
+
+    public function tearDown()
+    {
+        parent::tearDown();
+    }
+
+    /**
+     * @dataProvider provideForRule
+     */
+    public function testRule($options, $value, $expectedResult, $unicodeSetting = null)
+    {
+        $rule   = new AlphaRule($options);
+        $filter = new Alpha();
+
+        if ($unicodeSetting !== null) {
+
+            $property = new \ReflectionProperty($filter, 'unicodeEnabled');
+            $property->setAccessible(true);
+            $property->setValue($filter, $unicodeSetting);
+
+        }
+
+        $result = $filter->apply($rule, $value);
+
+        $this->assertEquals($expectedResult, $result);
+    }
+
+    public function provideForRule()
+    {
+        return array(
+            array(false, "My Text", "MyText", true),
+            array(false, "My Text", "MyText", false),
+            array(true, "My Text", "My Text", true),
+            array(true, "My Text", "My Text", false),
+            array(true, "My Text!", "My Text", true),
+            array(true, "My Text!", "My Text", false),
+            array(true, "My Text21!", "My Text", true),
+            array(true, "My Text21!", "My Text", false),
+            array(true, "João 2Sorrisão", "João Sorrisão", true),
+            array(true, "João 2Sorrisão", "Joo Sorriso", false),
+            array(true, "Helgi Þormar Þorbjörnsson", "Helgi Þormar Þorbjörnsson", true),
+            array(true, "Helgi Þormar Þorbjörnsson", "Helgi ormar orbjrnsson", false),
+            array(true, "Helgi Þormar!@#$&*( )(*&%$#@Þorbjörnsson", "Helgi Þormar Þorbjörnsson", true),
+            array(true, "Helgi Þormar!@#$&*( )(*&%$#@Þorbjörnsson", "Helgi ormar orbjrnsson", false),
+        );
+    }
+}
diff --git a/tests/DMS/Filter/Filters/BooleanTest.php b/tests/DMS/Filter/Filters/BooleanTest.php
new file mode 100644
index 0000000..7564a0f
--- /dev/null
+++ b/tests/DMS/Filter/Filters/BooleanTest.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace DMS\Filter\Filters;
+
+use DMS\Tests\FilterTestCase;
+use DMS\Filter\Rules\Boolean as BooleanRule;
+
+class BooleanTest extends FilterTestCase
+{
+
+    public function setUp()
+    {
+        parent::setUp();
+    }
+
+    public function tearDown()
+    {
+        parent::tearDown();
+    }
+
+    /**
+     * @dataProvider provideForRule
+     */
+    public function testRule($options, $value, $expectedResult)
+    {
+        $rule = new BooleanRule($options);
+        $filter = new Boolean();
+
+        $result = $filter->apply($rule, $value);
+
+        $this->assertEquals($expectedResult, $result);
+    }
+
+    public function provideForRule()
+    {
+        return array(
+            array(null, "My Text", true),
+            array(null, "", false),
+            array(null, NULL, false),
+            array(null, 21.9, true),
+            array(null, 21, true),
+            array(null, 0, false),
+        );
+    }
+}
diff --git a/tests/DMS/Filter/Filters/CallbackTest.php b/tests/DMS/Filter/Filters/CallbackTest.php
new file mode 100644
index 0000000..3418e85
--- /dev/null
+++ b/tests/DMS/Filter/Filters/CallbackTest.php
@@ -0,0 +1,138 @@
+<?php
+
+namespace DMS\Filter\Filters;
+
+use DMS\Tests\Dummy\Classes\AnnotatedClass;
+use DMS\Tests\FilterTestCase;
+use DMS\Filter\Rules\Callback as CallbackRule;
+
+class CallbackTest extends FilterTestCase
+{
+    /**
+     * @var CallbackRule | \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $rule;
+
+    /**
+     * @var \DMS\Filter\Filters\Callback
+     */
+    protected $filter;
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->rule = $this->getMock('DMS\Filter\Rules\Callback');
+        $this->filter = new Callback();
+    }
+
+    public function testRuleWithObjectMethod()
+    {
+        $this->rule->expects($this->once())->method('getInputType')->will(
+            $this->returnValue(CallbackRule::SELF_METHOD_TYPE)
+        );
+        $this->rule->callback = 'callbackMethod';
+
+        $obj = new AnnotatedClass();
+
+        $this->filter->setCurrentObject($obj);
+        $result = $this->filter->apply($this->rule, 'value');
+
+        $this->assertEquals('called_back', $result);
+    }
+
+    /**
+     * @expectedException \DMS\Filter\Exception\InvalidCallbackException
+     */
+    public function testRuleWithObjectMethodInvalid()
+    {
+        $this->rule->expects($this->once())->method('getInputType')->will(
+            $this->returnValue(CallbackRule::SELF_METHOD_TYPE)
+        );
+        $this->rule->callback = 'callbackMissingMethod';
+
+        $obj = new AnnotatedClass();
+
+        $this->filter->setCurrentObject($obj);
+        $this->filter->apply($this->rule, 'value');
+    }
+
+    /**
+     * @expectedException \DMS\Filter\Exception\FilterException
+     */
+    public function testRuleWithObjectMethodButNoObject()
+    {
+        $this->rule->expects($this->once())->method('getInputType')->will(
+            $this->returnValue(CallbackRule::SELF_METHOD_TYPE)
+        );
+        $this->rule->callback = 'callbackMissingMethod';
+
+        $this->filter->apply($this->rule, 'value');
+    }
+
+    public function testRuleWithCallable()
+    {
+        $this->rule->expects($this->once())->method('getInputType')->will(
+            $this->returnValue(CallbackRule::CALLABLE_TYPE)
+        );
+        $this->rule->callback = array('DMS\Tests\Dummy\Classes\AnnotatedClass', 'anotherCallback');
+
+        $result = $this->filter->apply($this->rule, 'value');
+
+        $this->assertEquals('called_back', $result);
+    }
+
+    public function testRuleWithNonStaticCallable()
+    {
+        $this->rule->expects($this->once())->method('getInputType')->will(
+            $this->returnValue(CallbackRule::CALLABLE_TYPE)
+        );
+        $this->rule->callback = array(new AnnotatedClass(), 'callbackMethod');
+
+        $result = $this->filter->apply($this->rule, 'value');
+
+        $this->assertEquals('called_back', $result);
+    }
+
+    /**
+     * @expectedException \DMS\Filter\Exception\InvalidCallbackException
+     */
+    public function testRuleWithCallableInvalid()
+    {
+        $this->rule->expects($this->once())->method('getInputType')->will(
+            $this->returnValue(CallbackRule::CALLABLE_TYPE)
+        );
+        $this->rule->callback = array('DMS\Tests\Dummy\Classes\AnnotatedClass', 'callbackMissingMethod');
+
+        $result = $this->filter->apply($this->rule, 'value');
+    }
+
+    public function testRuleWithClosure()
+    {
+        $closure = function ($value) {
+            return 'called_back';
+        };
+
+        $this->rule->expects($this->once())->method('getInputType')->will(
+            $this->returnValue(CallbackRule::CLOSURE_TYPE)
+        );
+        $this->rule->callback = $closure;
+
+        $result = $this->filter->apply($this->rule, 'value');
+
+        $this->assertEquals('called_back', $result);
+    }
+
+    /**
+     * @expectedException \DMS\Filter\Exception\InvalidCallbackException
+     */
+    public function testRuleWithNonClosure()
+    {
+        $this->rule->expects($this->once())->method('getInputType')->will(
+            $this->returnValue(CallbackRule::CLOSURE_TYPE)
+        );
+        $this->rule->callback = "i'm not a closure";
+
+        $result = $this->filter->apply($this->rule, 'value');
+    }
+}
diff --git a/tests/DMS/Filter/Filters/DigitsTest.php b/tests/DMS/Filter/Filters/DigitsTest.php
new file mode 100644
index 0000000..7371a87
--- /dev/null
+++ b/tests/DMS/Filter/Filters/DigitsTest.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace DMS\Filter\Filters;
+
+use DMS\Tests\FilterTestCase;
+use DMS\Filter\Rules\Digits as DigitsRule;
+
+class DigitsTest extends FilterTestCase
+{
+
+    public function setUp()
+    {
+        parent::setUp();
+    }
+
+    public function tearDown()
+    {
+        parent::tearDown();
+    }
+
+    /**
+     * @dataProvider provideForRule
+     */
+    public function testRule($options, $value, $expectedResult, $unicodeSetting = null)
+    {
+        $rule   = new DigitsRule($options);
+        $filter = new Digits();
+
+        if ($unicodeSetting !== null) {
+
+            $property = new \ReflectionProperty($filter, 'unicodeEnabled');
+            $property->setAccessible(true);
+            $property->setValue($filter, $unicodeSetting);
+
+        }
+
+        $result = $filter->apply($rule, $value);
+
+        $this->assertEquals($expectedResult, $result);
+    }
+
+    public function provideForRule()
+    {
+        return array(
+            array(false, "My Text", ""),
+            array(false, "001 t55", "00155"),
+            array(true, "My 23 dogs", " 23 "),
+            array(false, "My 23 dogs", "23"),
+            array(true, "233 055", "233 055", true),
+            array(true, "233 055", "233 055", false),
+            array(true, "233 t055s", "233 055"),
+            array(true, "My Text21!", "21"),
+            array(true, "João Sorrisão", " ", true),
+            array(true, "João Sorrisão", " ", false),
+            array(true, "001Helgi Þormar Þorbjörnsson", "001  ", true),
+            array(true, "001Helgi Þormar Þorbjörnsson", "001  ", false),
+        );
+    }
+}
diff --git a/tests/DMS/Filter/Filters/FloatTest.php b/tests/DMS/Filter/Filters/FloatTest.php
new file mode 100644
index 0000000..ccbb6b6
--- /dev/null
+++ b/tests/DMS/Filter/Filters/FloatTest.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace DMS\Filter\Filters;
+
+use DMS\Tests\FilterTestCase;
+use DMS\Filter\Rules\Float as FloatRule;
+
+class FloatTest extends FilterTestCase
+{
+
+    public function setUp()
+    {
+        parent::setUp();
+    }
+
+    public function tearDown()
+    {
+        parent::tearDown();
+    }
+
+    /**
+     * @dataProvider provideForRule
+     */
+    public function testRule($options, $value, $expectedResult)
+    {
+        $rule   = new FloatRule($options);
+        $filter = new Float();
+
+        $result = $filter->apply($rule, $value);
+
+        $this->assertEquals($expectedResult, $result);
+    }
+
+    public function provideForRule()
+    {
+        return array(
+            array(null, "My Text", 0.0),
+            array(null, "21", 21.0),
+            array(null, "21.2", 21.2),
+            array(null, 21.9, 21.9),
+        );
+    }
+}
diff --git a/tests/DMS/Filter/Filters/HtmlEntitiesTest.php b/tests/DMS/Filter/Filters/HtmlEntitiesTest.php
new file mode 100644
index 0000000..18a1305
--- /dev/null
+++ b/tests/DMS/Filter/Filters/HtmlEntitiesTest.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace DMS\Filter\Filters;
+
+use DMS\Tests\FilterTestCase;
+use DMS\Filter\Rules\HtmlEntities as HtmlEntitiesRule;
+
+class HtmlEntitiesTest extends FilterTestCase
+{
+
+    public function setUp()
+    {
+        parent::setUp();
+    }
+
+    public function tearDown()
+    {
+        parent::tearDown();
+    }
+
+    /**
+     * @dataProvider provideForRule
+     */
+    public function testRule($options, $value, $expectedResult)
+    {
+        $rule   = new HtmlEntitiesRule($options);
+        $filter = new HtmlEntities();
+
+        $result = $filter->apply($rule, $value);
+
+        $this->assertEquals($expectedResult, $result);
+    }
+
+    public function provideForRule()
+    {
+        return array(
+            array(array(), "This is some téxt &", "This is some t&eacute;xt &amp;"),
+            array(array(), "This &amp; is a &", "This &amp;amp; is a &amp;"),
+            array(array('doubleEncode' => false), "This &amp; is a &", "This &amp; is a &amp;"),
+            array(array('flags' => ENT_IGNORE), "With '\" quotes", "With '\" quotes"),
+            array(array(), "With '\" quotes", "With '&quot; quotes"),
+            array(array('flags' => ENT_QUOTES), "With '\" quotes", "With &#039;&quot; quotes"),
+        );
+    }
+}
diff --git a/tests/DMS/Filter/Filters/IntTest.php b/tests/DMS/Filter/Filters/IntTest.php
new file mode 100644
index 0000000..fa0c3a2
--- /dev/null
+++ b/tests/DMS/Filter/Filters/IntTest.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace DMS\Filter\Filters;
+
+use DMS\Tests\FilterTestCase;
+use DMS\Filter\Rules\Int as IntRule;
+
+class IntTest extends FilterTestCase
+{
+
+    public function setUp()
+    {
+        parent::setUp();
+    }
+
+    public function tearDown()
+    {
+        parent::tearDown();
+    }
+
+    /**
+     * @dataProvider provideForRule
+     */
+    public function testRule($options, $value, $expectedResult)
+    {
+        $rule   = new IntRule($options);
+        $filter = new Int();
+
+        $result = $filter->apply($rule, $value);
+
+        $this->assertEquals($expectedResult, $result);
+    }
+
+    public function provideForRule()
+    {
+        return array(
+            array(null, "My Text", 0),
+            array(null, true, 1),
+            array(null, "21", 21),
+            array(null, "21.2", 21),
+            array(null, "21.9", 21),
+            array(null, 21.9, 21),
+        );
+    }
+}
diff --git a/tests/DMS/Filter/Filters/Loader/FilterLoaderTest.php b/tests/DMS/Filter/Filters/Loader/FilterLoaderTest.php
new file mode 100644
index 0000000..8599bc3
--- /dev/null
+++ b/tests/DMS/Filter/Filters/Loader/FilterLoaderTest.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace DMS\Filter\Filters\Loader;
+
+use DMS\Filter\Rules\StripTags;
+use DMS\Tests\Dummy\Rules\NoOptionsRule;
+use DMS\Tests\FilterTestCase;
+
+class FilterLoaderTest extends FilterTestCase
+{
+    /**
+     * @var FilterLoader
+     */
+    protected $loader;
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->loader = new FilterLoader();
+    }
+
+    public function tearDown()
+    {
+        parent::tearDown();
+    }
+
+    /**
+     * @param $rule
+     * @param $return
+     * @param $expectException
+     *
+     * @dataProvider provideForGetFilter
+     */
+    public function testGetFilterForRule($rule, $return, $expectException)
+    {
+        if ($expectException) {
+            $this->setExpectedException('\UnexpectedValueException');
+        }
+
+        $this->assertEquals($return, $this->loader->getFilterForRule($rule));
+    }
+
+    public function provideForGetFilter()
+    {
+        return array(
+            array(new StripTags(), new \DMS\Filter\Filters\StripTags(), false),
+            array(new NoOptionsRule(), new \DMS\Filter\Filters\StripTags(), true),
+        );
+    }
+}
diff --git a/tests/DMS/Filter/Filters/PregReplaceTest.php b/tests/DMS/Filter/Filters/PregReplaceTest.php
new file mode 100644
index 0000000..b440b6d
--- /dev/null
+++ b/tests/DMS/Filter/Filters/PregReplaceTest.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace DMS\Filter\Filters;
+
+use DMS\Tests\FilterTestCase;
+use DMS\Filter\Rules\PregReplace as PregReplaceRule;
+
+class PregReplaceTest extends FilterTestCase
+{
+
+    public function setUp()
+    {
+        parent::setUp();
+    }
+
+    public function tearDown()
+    {
+        parent::tearDown();
+    }
+
+    /**
+     * @dataProvider provideForRule
+     */
+    public function testRule($options, $value, $expectedResult)
+    {
+        $rule   = new PregReplaceRule($options);
+        $filter = new PregReplace();
+
+        $result = $filter->apply($rule, $value);
+
+        $this->assertEquals($expectedResult, $result);
+    }
+
+    public function provideForRule()
+    {
+        return array(
+            array(array('regexp' => '/(old )/'), "the crazy old fox", "the crazy fox"),
+            array(array('regexp' => '/(old)/', 'replacement' => 'new'), "the crazy old fox", "the crazy new fox"),
+            array(array('regexp' => '/([0-9]*)/'), "this is day 21", "this is day "),
+            array(array('regexp' => '/(style=\"[^\"]*\")/'), "<table style=\"width: 23px\" class=\"myclass\">", "<table  class=\"myclass\">"),
+        );
+    }
+}
diff --git a/tests/DMS/Filter/Filters/StripNewlinesTest.php b/tests/DMS/Filter/Filters/StripNewlinesTest.php
new file mode 100644
index 0000000..5d67d7d
--- /dev/null
+++ b/tests/DMS/Filter/Filters/StripNewlinesTest.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace DMS\Filter\Filters;
+
+use DMS\Tests\FilterTestCase;
+use DMS\Filter\Rules\StripNewlines as StripNewLinesRule;
+
+class StripNewlinesTest extends FilterTestCase
+{
+
+    public function setUp()
+    {
+        parent::setUp();
+    }
+
+    public function tearDown()
+    {
+        parent::tearDown();
+    }
+
+    /**
+     * @dataProvider provideForRule
+     */
+    public function testRule($options, $value, $expectedResult)
+    {
+        $rule   = new StripNewLinesRule($options);
+        $filter = new StripNewlines();
+
+        $result = $filter->apply($rule, $value);
+
+        $this->assertEquals($expectedResult, $result);
+    }
+
+    public function provideForRule()
+    {
+        return array(
+            array(null, "My \n Text", "My  Text"),
+            array(null, "My \n\r Text", "My  Text"),
+            array(null, "My \r\n Text", "My  Text"),
+            array(null, "My
+Text", "MyText"),
+        );
+    }
+}
diff --git a/tests/DMS/Filter/Filters/StripTagsTest.php b/tests/DMS/Filter/Filters/StripTagsTest.php
new file mode 100644
index 0000000..1e5ac3e
--- /dev/null
+++ b/tests/DMS/Filter/Filters/StripTagsTest.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace DMS\Filter\Filters;
+
+use DMS\Tests\FilterTestCase;
+use DMS\Filter\Rules\StripTags as StripTagsRule;
+
+class StripTagsTest extends FilterTestCase
+{
+
+    public function setUp()
+    {
+        parent::setUp();
+    }
+
+    public function tearDown()
+    {
+        parent::tearDown();
+    }
+
+    /**
+     * @dataProvider provideForRule
+     */
+    public function testRule($options, $value, $expectedResult)
+    {
+        $rule   = new StripTagsRule($options);
+        $filter = new StripTags();
+
+        $result = $filter->apply($rule, $value);
+
+        $this->assertEquals($expectedResult, $result);
+    }
+
+    public function provideForRule()
+    {
+        return array(
+            array(array(), "<b>my text</b>", "my text"),
+            array(array(), "<b>my < not an html tag> text</b>", "my < not an html tag> text"),
+            array(array(), "<b>in this case a < 2 a > 3;</b>", "in this case a < 2 a > 3;"),
+            array(array('allowed' => "<p>"), "<b><p>my text</p></b>", "<p>my text</p>"),
+            array("<p>", "<b><p>my text</p></b>", "<p>my text</p>"),
+        );
+    }
+}
diff --git a/tests/DMS/Filter/Filters/ToLowerTest.php b/tests/DMS/Filter/Filters/ToLowerTest.php
new file mode 100644
index 0000000..6024d0a
--- /dev/null
+++ b/tests/DMS/Filter/Filters/ToLowerTest.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace DMS\Filter\Filters;
+
+use DMS\Tests\FilterTestCase;
+use DMS\Filter\Rules\ToLower as ToLowerRule;
+
+class ToLowerTest extends FilterTestCase
+{
+
+    public function setUp()
+    {
+        parent::setUp();
+    }
+
+    public function tearDown()
+    {
+        parent::tearDown();
+    }
+
+    /**
+     * @dataProvider provideForRule
+     */
+    public function testRule($options, $value, $expectedResult, $useEncoding)
+    {
+        if ($useEncoding && !function_exists('mb_strtolower')) {
+            $this->markTestSkipped ('mbstring extension not enabled');
+        }
+
+        $rule   = new ToLowerRule($options);
+        $filter = new ToLower();
+
+        $result = $filter->apply($rule, $value);
+
+        $this->assertEquals($expectedResult, $result);
+    }
+
+    /**
+     * @expectedException \DMS\Filter\Exception\FilterException
+     */
+    public function testInvalidEncoding()
+    {
+        if ( ! function_exists('mb_strtolower')) {
+            $this->markTestSkipped ('mbstring extension not enabled');
+        }
+
+        $rule = new ToLowerRule(array('encoding' => 'invalid'));
+        $filter = new ToLower();
+
+        $result = $filter->apply($rule, 'x');
+    }
+
+    public function provideForRule()
+    {
+        return array(
+            array(array('encoding' => 'utf-8'), "MY TEXT", "my text", true),
+            array(array('encoding' => 'utf-8'), "MY Ã TEXT", "my ã text", true),
+            array(array('encoding' => 'utf-8'), "MY Á TEXT", "my á text", true),
+            array('utf-8', "MY Á TEXT", "my á text", true),
+            array(array(), "MY TEXT", "my text", false ),
+            array(array(), "MY TEXT", "my text", false ),
+        );
+    }
+}
diff --git a/tests/DMS/Filter/Filters/ToUpperTest.php b/tests/DMS/Filter/Filters/ToUpperTest.php
new file mode 100644
index 0000000..5b628e8
--- /dev/null
+++ b/tests/DMS/Filter/Filters/ToUpperTest.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace DMS\Filter\Filters;
+
+use DMS\Tests\FilterTestCase;
+use DMS\Filter\Rules\ToUpper as ToUpperRule;
+
+class ToUpperTest extends FilterTestCase
+{
+
+    public function setUp()
+    {
+        parent::setUp();
+    }
+
+    public function tearDown()
+    {
+        parent::tearDown();
+    }
+
+    /**
+     * @dataProvider provideForRule
+     */
+    public function testRule($options, $value, $expectedResult, $useEncoding)
+    {
+        if ($useEncoding && !function_exists('mb_strtoupper')) {
+            $this->markTestSkipped ('mbstring extension not enabled');
+        }
+
+        $rule   = new ToUpperRule($options);
+        $filter = new ToUpper();
+
+        $result = $filter->apply($rule, $value);
+
+        $this->assertEquals($expectedResult, $result);
+    }
+
+    /**
+     * @expectedException \DMS\Filter\Exception\FilterException
+     */
+    public function testInvalidEncoding()
+    {
+        if ( ! function_exists('mb_strtoupper')) {
+            $this->markTestSkipped ('mbstring extension not enabled');
+        }
+
+        $rule   = new ToUpperRule(array('encoding' => 'invalid'));
+        $filter = new ToUpper();
+
+        $result = $filter->apply($rule, 'x');
+    }
+
+    public function provideForRule()
+    {
+        return array(
+            array(array('encoding' => 'utf-8'), "my text", "MY TEXT", true),
+            array(array('encoding' => 'utf-8'), "my ã text", "MY Ã TEXT", true),
+            array(array('encoding' => 'utf-8'), "my á text", "MY Á TEXT", true),
+            array('utf-8', "my á text", "MY Á TEXT", true),
+            array(array(), "my text", "MY TEXT", false ),
+            array(array(), "my text", "MY TEXT", false ),
+        );
+    }
+}
diff --git a/tests/DMS/Filter/Filters/TrimTest.php b/tests/DMS/Filter/Filters/TrimTest.php
new file mode 100644
index 0000000..d1ecd58
--- /dev/null
+++ b/tests/DMS/Filter/Filters/TrimTest.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace DMS\Filter\Filters;
+
+use DMS\Tests\FilterTestCase;
+use DMS\Filter\Rules\Trim as TrimRule;
+
+class TrimTest extends FilterTestCase
+{
+
+    public function setUp()
+    {
+        parent::setUp();
+    }
+
+    public function tearDown()
+    {
+        parent::tearDown();
+    }
+
+    /**
+     * @dataProvider provideForRule
+     */
+    public function testRule($options, $value, $expectedResult)
+    {
+        $rule   = new TrimRule($options);
+        $filter = new Trim();
+
+        $result = $filter->apply($rule, $value);
+
+        $this->assertEquals($expectedResult, $result);
+    }
+
+    public function provideForRule()
+    {
+        return array(
+            array(array(), " my text", "my text"),
+            array(array(), " my text ", "my text"),
+            array(array(), "my text ", "my text"),
+            array(array('charlist' => "\\"), "\my text", "my text"),
+            array("\\", "\my text", "my text"),
+            array("x", "xmy textx", "my text"),
+        );
+    }
+}
diff --git a/tests/DMS/Filter/Filters/ZendTest.php b/tests/DMS/Filter/Filters/ZendTest.php
new file mode 100644
index 0000000..707ed07
--- /dev/null
+++ b/tests/DMS/Filter/Filters/ZendTest.php
@@ -0,0 +1,45 @@
+<?php
+
+
+namespace DMS\Filter\Filters;
+
+use DMS\Filter\Rules\Zend as ZendRule;
+use DMS\Tests\FilterTestCase;
+
+class ZendTest extends FilterTestCase
+{
+
+    public function testFilterShortname()
+    {
+        $rule = $this->buildRule('Boolean', array('casting' => false));
+        $filter = new Zend();
+        $filter->apply($rule, '0');
+    }
+
+    public function testFilterFullname()
+    {
+        $rule = $this->buildRule('Zend\Filter\Boolean', array('casting' => false));
+        $filter = new Zend();
+        $filter->apply($rule, '0');
+    }
+
+    /**
+     * @expectedException \DMS\Filter\Exception\InvalidZendFilterException
+     */
+    public function testInvalidFilter()
+    {
+        $rule = $this->buildRule('MissingFilter');
+        $filter = new Zend();
+        $filter->apply($rule, '0');
+    }
+
+    protected function buildRule($class, $options = array())
+    {
+        return new ZendRule(
+            array(
+                'class'   => $class,
+                'zendOptions' => $options,
+            )
+        );
+    }
+}
diff --git a/tests/DMS/Filter/Mapping/ClassMetadataFactoryTest.php b/tests/DMS/Filter/Mapping/ClassMetadataFactoryTest.php
new file mode 100644
index 0000000..c50cb6c
--- /dev/null
+++ b/tests/DMS/Filter/Mapping/ClassMetadataFactoryTest.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace DMS\Filter\Mapping;
+
+use DMS\Tests\FilterTestCase;
+use Doctrine\Common\Cache\ArrayCache;
+
+class ClassMetadataFactoryTest extends FilterTestCase
+{
+
+    /**
+     * @var ClassMetadataFactory
+     */
+    protected $factory;
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->factory = $this->buildMetadataFactory();
+    }
+
+    public function tearDown()
+    {
+        parent::tearDown();
+    }
+
+    public function testGetClassMetadata()
+    {
+        $metadata = $this->factory->getClassMetadata('DMS\Tests\Dummy\Classes\AnnotatedClass');
+
+        $this->assertInstanceOf('DMS\Filter\Mapping\ClassMetadataInterface', $metadata);
+    }
+
+    public function testParsedMetadataFromFactory()
+    {
+        $metadata = $this->factory->getClassMetadata('DMS\Tests\Dummy\Classes\AnnotatedClass');
+
+        $metadataReparsed = $this->factory->getClassMetadata('DMS\Tests\Dummy\Classes\AnnotatedClass');
+
+        $this->assertSame($metadata, $metadataReparsed);
+
+    }
+
+    public function testCachedMetadataFromFactory()
+    {
+        $cache = new ArrayCache();
+
+        $this->factory = new ClassMetadataFactory($this->loader, $cache);
+
+        $metadata = $this->factory->getClassMetadata('DMS\Tests\Dummy\Classes\AnnotatedClass');
+
+        $this->assertTrue($cache->contains(ltrim('DMS\Tests\Dummy\Classes\AnnotatedClass', '\\')));
+
+        //Get new Factory to retrieve from cache
+        $this->factory = new ClassMetadataFactory($this->loader, $cache);
+        $metadataCached = $this->factory->getClassMetadata('DMS\Tests\Dummy\Classes\AnnotatedClass');
+
+        $this->assertEquals($metadata, $metadataCached);
+    }
+}
+
+?>
diff --git a/tests/DMS/Filter/Rules/CallbackTest.php b/tests/DMS/Filter/Rules/CallbackTest.php
new file mode 100644
index 0000000..bbc7133
--- /dev/null
+++ b/tests/DMS/Filter/Rules/CallbackTest.php
@@ -0,0 +1,47 @@
+<?php
+
+
+namespace DMS\Filter\Rules;
+
+use DMS\Tests\Dummy\Classes\AnnotatedClass;
+use DMS\Tests\FilterTestCase;
+
+class CallbackTest extends FilterTestCase
+{
+
+    /**
+     * @param $input
+     * @param $expectedOutput
+     * @param $expectException
+     *
+     * @dataProvider provideInputs
+     */
+    public function testGetInputType($input, $expectedOutput, $expectException)
+    {
+        if ($expectException) {
+            $this->setExpectedException('DMS\Filter\Exception\InvalidCallbackException');
+        }
+
+        $rule = new Callback($input);
+
+        $this->assertEquals($expectedOutput, $rule->getInputType());
+    }
+
+    public function provideInputs()
+    {
+        $closure = function ($v) {
+            return;
+        };
+
+        return array(
+            array('objMethod', Callback::SELF_METHOD_TYPE, false),
+            array(array('DMS\Tests\Dummy\Classes\AnnotatedClass', 'anotherCallback'), Callback::CALLABLE_TYPE, false),
+            array(array('DMS\Tests\Dummy\Classes\AnnotatedClass', 'missingCallback'), null, true),
+            array(array(new AnnotatedClass(), 'callbackMethod'), Callback::CALLABLE_TYPE, false),
+            array('strlen', Callback::CALLABLE_TYPE, false),
+            array($closure, Callback::CLOSURE_TYPE, false),
+            array(1, null, true),
+            array(new \stdClass(), null, true),
+        );
+    }
+}
diff --git a/tests/DMS/Filter/Rules/RuleTest.php b/tests/DMS/Filter/Rules/RuleTest.php
new file mode 100644
index 0000000..5db183b
--- /dev/null
+++ b/tests/DMS/Filter/Rules/RuleTest.php
@@ -0,0 +1,102 @@
+<?php
+
+namespace DMS\Filter\Rules;
+
+use DMS\Filter\Exception\InvalidOptionsException;
+use DMS\Filter\Exception\MissingOptionsException;
+use DMS\Filter\Exception\RuleDefinitionException;
+use DMS\Tests\Dummy\Rules\DefaultOptionRule;
+use DMS\Tests\Dummy\Rules\InvalidDefaultOptionRule;
+use DMS\Tests\Dummy\Rules\MultipleOptionsRule;
+use DMS\Tests\Dummy\Rules\NoOptionsRule;
+use DMS\Tests\Dummy\Rules\RequiredOptionsRule;
+use DMS\Tests\FilterTestCase;
+
+class RuleTest extends FilterTestCase
+{
+
+    public function setUp()
+    {
+        parent::setUp();
+    }
+
+    public function tearDown()
+    {
+        parent::tearDown();
+    }
+
+    public function testConstructorHappyPath()
+    {
+        $rule = new NoOptionsRule();
+
+        $this->assertInstanceOf('DMS\Filter\Rules\Rule', $rule);
+    }
+
+    public function testConstructorDefaultOption()
+    {
+        $rule = new DefaultOptionRule('value');
+
+        $this->assertInstanceOf('DMS\Filter\Rules\Rule', $rule);
+    }
+
+    public function testConstructorDefaultOptionInArray()
+    {
+        $rule = new DefaultOptionRule(array('value' => 'optionvalue'));
+
+        $this->assertInstanceOf('DMS\Filter\Rules\Rule', $rule);
+    }
+
+    public function testConstructorHappyPathWithRequired()
+    {
+        $rule = new RequiredOptionsRule(array('config' => 'value', 'path' => '/path/to/'));
+
+        $this->assertInstanceOf('DMS\Filter\Rules\Rule', $rule);
+    }
+
+    /**
+     * @expectedException DMS\Filter\Exception\RuleDefinitionException
+     */
+    public function testConstructorNoDefinedDefaultOption()
+    {
+        $rule = new NoOptionsRule('value');
+
+        $this->assertInstanceOf('DMS\Filter\Rules\Rule', $rule);
+    }
+
+    /**
+     * @expectedException DMS\Filter\Exception\InvalidOptionsException
+     */
+    public function testConstructorInvalidOption()
+    {
+        $rule = new MultipleOptionsRule(array('invalid' => 'option'));
+    }
+
+    /**
+     * @expectedException DMS\Filter\Exception\InvalidOptionsException
+     */
+    public function testConstructorInvalidDefaultOption()
+    {
+        $rule = new InvalidDefaultOptionRule('value');
+    }
+
+    /**
+     * @expectedException DMS\Filter\Exception\MissingOptionsException
+     */
+    public function testConstructorMissingOption()
+    {
+        $rule = new RequiredOptionsRule(array('config' => 'option'));
+    }
+
+    public function testOptionExceptionInformation()
+    {
+        try {
+            $rule = new MultipleOptionsRule(array('invalid' => 'option'));
+        } catch (InvalidOptionsException $e) {
+
+            $this->assertInternalType('array', $e->getOptions());
+
+            $this->assertContains('invalid', $e->getOptions());
+
+        }
+    }
+}
diff --git a/tests/DMS/Tests/Dummy/Classes/AnnotatedClass.php b/tests/DMS/Tests/Dummy/Classes/AnnotatedClass.php
new file mode 100644
index 0000000..2e3f640
--- /dev/null
+++ b/tests/DMS/Tests/Dummy/Classes/AnnotatedClass.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace DMS\Tests\Dummy\Classes;
+
+use DMS\Filter\Rules as Filter;
+
+class AnnotatedClass
+{
+    /**
+     * @Filter\StripTags()
+     *
+     * @var string
+     */
+    public $name;
+
+    /**
+     * @Filter\StripTags()
+     *
+     * @var string
+     */
+    public $nickname;
+
+    /**
+     * @Filter\StripTags("<b><i>")
+     *
+     * @var string
+     */
+    public $description;
+
+    /**
+     * @var string
+     * @Filter\Callback("callbackMethod")
+     */
+    public $callback;
+
+    /**
+     * @var string
+     * @Filter\Callback({"DMS\Tests\Dummy\Classes\AnnotatedClass", "anotherCallback"})
+     */
+    public $callback2;
+
+    /**
+     * @var string
+     * @Filter\Zend("StringToLower")
+     */
+    public $zend;
+
+    /**
+     * @var string
+     * @Filter\Zend(class="Boolean", zendOptions={"casting"=false})
+     */
+    public $zendalternate;
+
+    /**
+     * @param $value
+     * @return string
+     */
+    public function callbackMethod($value)
+    {
+        return 'called_back';
+    }
+
+    /**
+     * @param $value
+     * @return string
+     */
+    public static function anotherCallback($value)
+    {
+        return 'called_back';
+    }
+}
diff --git a/tests/DMS/Tests/Dummy/Classes/AnnotatedInterface.php b/tests/DMS/Tests/Dummy/Classes/AnnotatedInterface.php
new file mode 100644
index 0000000..f39c03e
--- /dev/null
+++ b/tests/DMS/Tests/Dummy/Classes/AnnotatedInterface.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace DMS\Tests\Dummy\Classes;
+
+interface AnnotatedInterface
+{
+
+}
diff --git a/tests/DMS/Tests/Dummy/Classes/ChildAnnotatedClass.php b/tests/DMS/Tests/Dummy/Classes/ChildAnnotatedClass.php
new file mode 100644
index 0000000..619facd
--- /dev/null
+++ b/tests/DMS/Tests/Dummy/Classes/ChildAnnotatedClass.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace DMS\Tests\Dummy\Classes;
+
+use DMS\Filter\Rules as Filter;
+
+class ChildAnnotatedClass extends AnnotatedClass implements AnnotatedInterface
+{
+    /**
+     * @Filter\Trim()
+     *
+     * @var string
+     */
+    public $surname;
+
+}
diff --git a/tests/DMS/Tests/Dummy/Rules/DefaultOptionRule.php b/tests/DMS/Tests/Dummy/Rules/DefaultOptionRule.php
new file mode 100644
index 0000000..d428816
--- /dev/null
+++ b/tests/DMS/Tests/Dummy/Rules/DefaultOptionRule.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace DMS\Tests\Dummy\Rules;
+
+use DMS\Filter\Rules\Rule;
+
+class DefaultOptionRule extends Rule
+{
+    public $config;
+
+    public function applyFilter($value)
+    {
+        return $value;
+    }
+
+    public function getDefaultOption()
+    {
+        return 'config';
+    }
+
+}
diff --git a/tests/DMS/Tests/Dummy/Rules/InvalidDefaultOptionRule.php b/tests/DMS/Tests/Dummy/Rules/InvalidDefaultOptionRule.php
new file mode 100644
index 0000000..6942749
--- /dev/null
+++ b/tests/DMS/Tests/Dummy/Rules/InvalidDefaultOptionRule.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace DMS\Tests\Dummy\Rules;
+
+use DMS\Filter\Rules\Rule;
+
+class InvalidDefaultOptionRule extends Rule
+{
+    public $config;
+
+    public function applyFilter($value)
+    {
+        return $value;
+    }
+
+    public function getDefaultOption()
+    {
+        return 'path';
+    }
+
+}
diff --git a/tests/DMS/Tests/Dummy/Rules/MultipleOptionsRule.php b/tests/DMS/Tests/Dummy/Rules/MultipleOptionsRule.php
new file mode 100644
index 0000000..918d08a
--- /dev/null
+++ b/tests/DMS/Tests/Dummy/Rules/MultipleOptionsRule.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace DMS\Tests\Dummy\Rules;
+
+use DMS\Filter\Rules\Rule;
+
+class MultipleOptionsRule extends Rule
+{
+
+    public $config;
+    public $path;
+    public $url;
+
+    public function applyFilter($value)
+    {
+        return $value;
+    }
+
+
+}
diff --git a/tests/DMS/Tests/Dummy/Rules/NoOptionsRule.php b/tests/DMS/Tests/Dummy/Rules/NoOptionsRule.php
new file mode 100644
index 0000000..cd8a6ed
--- /dev/null
+++ b/tests/DMS/Tests/Dummy/Rules/NoOptionsRule.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace DMS\Tests\Dummy\Rules;
+
+use DMS\Filter\Rules\Rule;
+
+class NoOptionsRule extends Rule
+{
+    public function applyFilter($value)
+    {
+        return $value;
+    }
+
+}
diff --git a/tests/DMS/Tests/Dummy/Rules/RequiredOptionsRule.php b/tests/DMS/Tests/Dummy/Rules/RequiredOptionsRule.php
new file mode 100644
index 0000000..6d00e61
--- /dev/null
+++ b/tests/DMS/Tests/Dummy/Rules/RequiredOptionsRule.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace DMS\Tests\Dummy\Rules;
+
+use DMS\Filter\Rules\Rule;
+
+class RequiredOptionsRule extends Rule
+{
+    public $config;
+    public $path;
+    public $url;
+
+    public function applyFilter($value)
+    {
+        return $value;
+    }
+
+    public function getDefaultOption()
+    {
+        return 'config';
+    }
+
+    public function getRequiredOptions()
+    {
+        return array('config', 'path');
+    }
+
+}
diff --git a/tests/DMS/Tests/FilterTestCase.php b/tests/DMS/Tests/FilterTestCase.php
new file mode 100644
index 0000000..6a0ec6a
--- /dev/null
+++ b/tests/DMS/Tests/FilterTestCase.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace DMS\Tests;
+
+use DMS\Filter\Mapping;
+use Doctrine\Common\Annotations;
+
+class FilterTestCase extends \PHPUnit_Framework_TestCase
+{
+    protected $loader;
+
+    public function setUp()
+    {
+        parent::setUp();
+    }
+
+    public function tearDown()
+    {
+        parent::tearDown();
+    }
+
+    protected function buildMetadataFactory()
+    {
+        $reader = new Annotations\AnnotationReader();
+
+        $loader = new Mapping\Loader\AnnotationLoader($reader);
+        $this->loader = $loader;
+
+        $metadataFactory = new Mapping\ClassMetadataFactory($loader);
+
+        return $metadataFactory;
+    }
+}