diff --git a/pom.xml b/pom.xml
index bbcba56ce..adaf4c38e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,8 +143,8 @@ SOFTWARE.
org.apache.velocity
- velocity
- 1.7
+ velocity-engine-core
+ 2.0
compile
true
diff --git a/src/main/java/org/takes/rs/RsVelocity.java b/src/main/java/org/takes/rs/RsVelocity.java
index b9828bf7d..9ae6de3ef 100644
--- a/src/main/java/org/takes/rs/RsVelocity.java
+++ b/src/main/java/org/takes/rs/RsVelocity.java
@@ -36,9 +36,8 @@
import lombok.ToString;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.VelocityEngine;
-import org.apache.velocity.runtime.RuntimeConstants;
-import org.apache.velocity.runtime.log.NullLogChute;
import org.takes.Response;
+import org.takes.Scalar;
import org.takes.misc.Utf8InputStreamReader;
import org.takes.misc.Utf8OutputStreamWriter;
import org.takes.misc.Utf8String;
@@ -124,6 +123,17 @@ public RsVelocity(final InputStream template, final Map params) {
+ this(folder, template, () -> RsVelocity.convert(params));
+ }
+
+ /**
+ * Ctor.
+ * @param folder Template folder
+ * @param template Template
+ * @param params Map of params
+ */
+ public RsVelocity(final String folder,
+ final InputStream template, final Scalar