Added support for $placeholders
Improving docs