diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6031e93..4893020 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,19 @@
 Changelog
 =========
 
-## 2.0.0
+## 2.0.0RC1
 
-- Add tag filter
-- Redesign `extends` algorithm
-    - Blocks does not support dynamic names
+- Add tag the {filter}
+- Redesign `extends` algorithm:
+    - Blocks don't support dynamic names
     - Blocks can't be nested
 - Add tag options support
 - Improve Fenom API
 - Move benchmark to another project
-- Rename `\Fenom\Compiler` to `\Fenom\Tags`
+- Internal improvements
+- Add `Fenom::STRIP` option
+- Add tags {escape} and {strip}
+- Method addProvider accept compile path which will saved the template's PHP cache. If compile path is not specified, will be taken global compile path.
 
 ### 1.4.9 (2013-04-09)
 
diff --git a/docs/configuration.md b/docs/configuration.md
index fa29dce..54a2420 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -32,7 +32,7 @@ Options may by associative array like `'option_name' => true` or bitwise mask.
 | *force_include*        | `Fenom::FORCE_INCLUDE`    | paste template body instead of include-tag | increases performance, increases cache size |
 | *auto_escape*          | `Fenom::AUTO_ESCAPE`      | html-escape each variables outputs | decreases performance |
 | *force_verify*         | `Fenom::FORCE_VERIFY`     | check existence every used variable | decreases performance |
-| *auto_trim*            | `Fenom::AUTO_TRIM`        | remove space-characters before and after tags | |
+<!-- | *auto_trim*            | `Fenom::AUTO_TRIM`        | remove space-characters before and after tags | | -->
 | *disable_statics*      | `Fenom::DENY_STATICS`     | disable calling static methods in templates. | |
 | *strip*                | `Fenom::STRIP`            | strip all whitespaces in templates. | decrease cache size |
 
@@ -77,7 +77,7 @@ For `include`:
 * [CacheStreamWrapper::stream_eof](http://www.php.net/manual/en/streamwrapper.stream-eof.php)
 
 **Note**
-2014-05-13 Zend OpCacher не поддерживает протоколы кроме `file://` и `phar://`.
+(On 2014-05-13) Zend OpCacher doesn't support custom protocols except `file://` and `phar://`.
 
 For example,
 
@@ -92,3 +92,16 @@ $this->setCacheDir("redis://hash/compiled/");
 
 ### Callbacks and filters
 
+#### Before compile callback
+
+```php
+$fenom->addPreFilter(function () { /* ... */ });
+```
+
+#### Tag filter callback
+
+#### Filter callback
+
+#### After compile callback
+
+