diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/builder/MethodBuilder.groovy b/accurest-core/src/main/groovy/io/coderate/accurest/builder/MethodBuilder.groovy
index 43d8046e1d..956e165239 100644
--- a/accurest-core/src/main/groovy/io/coderate/accurest/builder/MethodBuilder.groovy
+++ b/accurest-core/src/main/groovy/io/coderate/accurest/builder/MethodBuilder.groovy
@@ -1,14 +1,14 @@
 package io.coderate.accurest.builder
 
+import groovy.util.logging.Slf4j
 import io.coderate.accurest.config.TestFramework
 import io.coderate.accurest.dsl.GroovyDsl
-import io.coderate.accurest.dsl.WiremockStubStrategy
 import io.coderate.accurest.util.NamesUtil
-import io.coderate.accurest.util.StubMappingConverter
 
 /**
  * @author Jakub Kubrynski
  */
+@Slf4j
 class MethodBuilder {
 
 	private final String methodName
@@ -23,6 +23,7 @@ class MethodBuilder {
 
 	static MethodBuilder createTestMethod(File stubsFile, TestFramework lang) {
 		GroovyDsl stubContent = new GroovyShell(this.classLoader).evaluate(stubsFile)
+		log.debug("Stub content Groovy DSL [$stubContent]")
 		String methodName = NamesUtil.camelCase(NamesUtil.toLastDot(NamesUtil.afterLast(stubsFile.path, File.separator)))
 		return new MethodBuilder(methodName, stubContent, lang)
 	}
diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/GroovyDsl.groovy b/accurest-core/src/main/groovy/io/coderate/accurest/dsl/GroovyDsl.groovy
index ad3d2f760a..6b2e9bbbc6 100644
--- a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/GroovyDsl.groovy
+++ b/accurest-core/src/main/groovy/io/coderate/accurest/dsl/GroovyDsl.groovy
@@ -8,7 +8,7 @@ import io.coderate.accurest.dsl.internal.Response
 
 @TypeChecked
 @EqualsAndHashCode(includeFields = true)
-@ToString(includeFields = true, includePackage = false)
+@ToString(includeFields = true, includePackage = false, includeNames = true)
 class GroovyDsl {
 
 	Request request
diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/Body.groovy b/accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/Body.groovy
index 63003589f0..e5ec6a36f2 100644
--- a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/Body.groovy
+++ b/accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/Body.groovy
@@ -5,7 +5,7 @@ import groovy.transform.EqualsAndHashCode
 import groovy.transform.ToString
 import org.codehaus.groovy.runtime.GStringImpl
 
-@ToString(includePackage = false, includeFields = true)
+@ToString(includePackage = false, includeFields = true, includeNames = true)
 @EqualsAndHashCode(includeFields = true)
 class Body extends DslProperty {
 
diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/DslProperty.groovy b/accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/DslProperty.groovy
index d2a58dfbf8..6887ffc88c 100644
--- a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/DslProperty.groovy
+++ b/accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/DslProperty.groovy
@@ -6,7 +6,7 @@ import groovy.transform.ToString
 
 @CompileStatic
 @EqualsAndHashCode(includeFields = true)
-@ToString(includePackage = false)
+@ToString(includePackage = false, includeNames = true)
 class DslProperty<T> {
 
 	final T clientValue
diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/Headers.groovy b/accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/Headers.groovy
index 80a848c2b6..625fd8658c 100644
--- a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/Headers.groovy
+++ b/accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/Headers.groovy
@@ -4,7 +4,7 @@ import groovy.transform.EqualsAndHashCode
 import groovy.transform.ToString
 
 @EqualsAndHashCode(includeFields = true)
-@ToString(includePackage = false, includeFields = true, ignoreNulls = true)
+@ToString(includePackage = false, includeFields = true, ignoreNulls = true, includeNames = true)
 class Headers {
 
 	private Map<String, WithValuePattern> assertionHeaders = [:]