diff --git a/composer.json b/composer.json
index 337a2e08..2ca6c3b1 100644
--- a/composer.json
+++ b/composer.json
@@ -34,7 +34,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "1.2-dev"
         }
     }
 }
diff --git a/match.php b/match.php
index 1a867113..6bb6a23c 100644
--- a/match.php
+++ b/match.php
@@ -16,6 +16,9 @@
     );
 }
 
+/**
+ * @deprecated since 1.1, to be removed in 2.0. Use SimpleFactory and object approach instead
+ */
 if (!function_exists('match')) {
     /**
      * @param  mixed   $value
diff --git a/src/Coduo/PHPMatcher/Matcher.php b/src/Coduo/PHPMatcher/Matcher.php
index 0357e774..f2c04503 100644
--- a/src/Coduo/PHPMatcher/Matcher.php
+++ b/src/Coduo/PHPMatcher/Matcher.php
@@ -1,19 +1,19 @@
 <?php
 namespace Coduo\PHPMatcher;
 
-use Coduo\PHPMatcher\Matcher\PropertyMatcher;
+use Coduo\PHPMatcher\Matcher\ValueMatcher;
 
 class Matcher
 {
     /**
-     * @var Matcher\PropertyMatcher
+     * @var ValueMatcher
      */
     private $matcher;
 
     /**
-     * @param PropertyMatcher $matcher
+     * @param ValueMatcher $matcher
      */
-    public function __construct(PropertyMatcher $matcher)
+    public function __construct(ValueMatcher $matcher)
     {
         $this->matcher = $matcher;
     }
diff --git a/src/Coduo/PHPMatcher/Matcher/ArrayMatcher.php b/src/Coduo/PHPMatcher/Matcher/ArrayMatcher.php
index aa195c2f..b75329ca 100644
--- a/src/Coduo/PHPMatcher/Matcher/ArrayMatcher.php
+++ b/src/Coduo/PHPMatcher/Matcher/ArrayMatcher.php
@@ -20,9 +20,9 @@ class ArrayMatcher extends Matcher
     private $accessor;
 
     /**
-     * @param PropertyMatcher $propertyMatcher
+     * @param ValueMatcher $propertyMatcher
      */
-    public function __construct(PropertyMatcher $propertyMatcher)
+    public function __construct(ValueMatcher $propertyMatcher)
     {
         $this->propertyMatcher = $propertyMatcher;
     }
diff --git a/src/Coduo/PHPMatcher/Matcher/ChainMatcher.php b/src/Coduo/PHPMatcher/Matcher/ChainMatcher.php
index 27481267..3ea37c19 100644
--- a/src/Coduo/PHPMatcher/Matcher/ChainMatcher.php
+++ b/src/Coduo/PHPMatcher/Matcher/ChainMatcher.php
@@ -7,12 +7,12 @@
 class ChainMatcher extends Matcher
 {
     /**
-     * @var array|PropertyMatcher[]
+     * @var array|ValueMatcher[]
      */
     private $matchers;
 
     /**
-     * @param array|PropertyMatcher[] $matchers
+     * @param array|ValueMatcher[] $matchers
      */
     public function __construct(array $matchers = array())
     {
@@ -20,9 +20,9 @@ public function __construct(array $matchers = array())
     }
 
     /**
-     * @param PropertyMatcher $matcher
+     * @param ValueMatcher $matcher
      */
-    public function addMatcher(PropertyMatcher $matcher)
+    public function addMatcher(ValueMatcher $matcher)
     {
         $this->matchers[] = $matcher;
     }
diff --git a/src/Coduo/PHPMatcher/Matcher/JsonMatcher.php b/src/Coduo/PHPMatcher/Matcher/JsonMatcher.php
index 00537b17..462329fe 100644
--- a/src/Coduo/PHPMatcher/Matcher/JsonMatcher.php
+++ b/src/Coduo/PHPMatcher/Matcher/JsonMatcher.php
@@ -13,9 +13,9 @@ class JsonMatcher extends Matcher
     private $matcher;
 
     /**
-     * @param PropertyMatcher $matcher
+     * @param ValueMatcher $matcher
      */
-    public function __construct(PropertyMatcher $matcher)
+    public function __construct(ValueMatcher $matcher)
     {
         $this->matcher = $matcher;
     }
diff --git a/src/Coduo/PHPMatcher/Matcher/Matcher.php b/src/Coduo/PHPMatcher/Matcher/Matcher.php
index 736da261..cb602a03 100644
--- a/src/Coduo/PHPMatcher/Matcher/Matcher.php
+++ b/src/Coduo/PHPMatcher/Matcher/Matcher.php
@@ -2,7 +2,7 @@
 
 namespace Coduo\PHPMatcher\Matcher;
 
-abstract class Matcher implements PropertyMatcher
+abstract class Matcher implements ValueMatcher
 {
     /**
      * @var string|null
diff --git a/src/Coduo/PHPMatcher/Matcher/PropertyMatcher.php b/src/Coduo/PHPMatcher/Matcher/PropertyMatcher.php
index f9ce5ff3..ff10da1c 100644
--- a/src/Coduo/PHPMatcher/Matcher/PropertyMatcher.php
+++ b/src/Coduo/PHPMatcher/Matcher/PropertyMatcher.php
@@ -2,29 +2,9 @@
 
 namespace Coduo\PHPMatcher\Matcher;
 
-interface PropertyMatcher
+/**
+ * @deprecated since 1.1, to be removed in 2.0. Use ValueMatcher instead
+ */
+interface PropertyMatcher extends ValueMatcher
 {
-    /**
-     * Matches value against the pattern
-     *
-     * @param $value
-     * @param $pattern
-     * @return boolean
-     */
-    public function match($value, $pattern);
-
-    /**
-     * Checks if matcher can match the pattern
-     *
-     * @param $pattern
-     * @return boolean
-     */
-    public function canMatch($pattern);
-
-    /**
-     * Returns a string description why matching failed
-     *
-     * @return null|string
-     */
-    public function getError();
 }
diff --git a/src/Coduo/PHPMatcher/Matcher/ValueMatcher.php b/src/Coduo/PHPMatcher/Matcher/ValueMatcher.php
new file mode 100644
index 00000000..4b9f7fbb
--- /dev/null
+++ b/src/Coduo/PHPMatcher/Matcher/ValueMatcher.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Coduo\PHPMatcher\Matcher;
+
+interface ValueMatcher
+{
+    /**
+     * Matches value against the pattern
+     *
+     * @param $value
+     * @param $pattern
+     * @return boolean
+     */
+    public function match($value, $pattern);
+
+    /**
+     * Checks if matcher can match the pattern
+     *
+     * @param $pattern
+     * @return boolean
+     */
+    public function canMatch($pattern);
+
+    /**
+     * Returns a string description why matching failed
+     *
+     * @return null|string
+     */
+    public function getError();
+}