Adds support for unescaped variables