diff --git a/pom.xml b/pom.xml
index 1e215f8..a0509fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.helenus</groupId>
     <artifactId>helenus-core</artifactId>
-    <version>2.0.9-SNAPSHOT</version>
+    <version>2.0.10-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>helenus</name>
diff --git a/src/main/java/net/helenus/core/operation/AbstractOptionalOperation.java b/src/main/java/net/helenus/core/operation/AbstractOptionalOperation.java
index 5c56442..507fd69 100644
--- a/src/main/java/net/helenus/core/operation/AbstractOptionalOperation.java
+++ b/src/main/java/net/helenus/core/operation/AbstractOptionalOperation.java
@@ -53,7 +53,7 @@ public abstract class AbstractOptionalOperation<E, O extends AbstractOptionalOpe
 
 	public Optional<E> sync() {
         Tracer tracer = this.sessionOps.getZipkinTracer();
-        final Span cassandraSpan = (tracer != null && span != null) ? tracer.newChild(span.context()) : null;
+        final Span cassandraSpan = (tracer != null && traceContext != null) ? tracer.newChild(traceContext) : null;
         if (cassandraSpan != null) {
             cassandraSpan.name("cassandra");
             cassandraSpan.start();
@@ -71,7 +71,7 @@ public abstract class AbstractOptionalOperation<E, O extends AbstractOptionalOpe
 
 	public ListenableFuture<Optional<E>> async() {
         final Tracer tracer = this.sessionOps.getZipkinTracer();
-        final Span cassandraSpan = (tracer != null && span != null) ? tracer.newChild(span.context()) : null;
+        final Span cassandraSpan = (tracer != null && traceContext != null) ? tracer.newChild(traceContext) : null;
         if (cassandraSpan != null) {
             cassandraSpan.name("cassandra");
             cassandraSpan.start();
diff --git a/src/main/java/net/helenus/core/operation/AbstractStatementOperation.java b/src/main/java/net/helenus/core/operation/AbstractStatementOperation.java
index 1e4a70a..9cdf890 100644
--- a/src/main/java/net/helenus/core/operation/AbstractStatementOperation.java
+++ b/src/main/java/net/helenus/core/operation/AbstractStatementOperation.java
@@ -15,8 +15,8 @@
  */
 package net.helenus.core.operation;
 
-import brave.Span;
 import brave.Tracer;
+import brave.propagation.TraceContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -44,7 +44,7 @@ public abstract class AbstractStatementOperation<E, O extends AbstractStatementO
 	public abstract Statement buildStatement();
 
 	protected boolean showValues = true;
-    protected Span span;
+    protected TraceContext traceContext;
 	private ConsistencyLevel consistencyLevel;
 	private ConsistencyLevel serialConsistencyLevel;
 	private RetryPolicy retryPolicy;
@@ -215,11 +215,11 @@ public abstract class AbstractStatementOperation<E, O extends AbstractStatementO
 		return statement;
 	}
 
-    public O withinSpan(Span span) {
-        if (span != null) {
+    public O zipkinContext(TraceContext traceContext) {
+        if (traceContext != null) {
             Tracer tracer = this.sessionOps.getZipkinTracer();
             if (tracer != null) {
-                this.span = span;
+                this.traceContext = traceContext;
             }
         }
 
diff --git a/src/main/java/net/helenus/core/operation/AbstractStreamOperation.java b/src/main/java/net/helenus/core/operation/AbstractStreamOperation.java
index da9fd16..c82af73 100644
--- a/src/main/java/net/helenus/core/operation/AbstractStreamOperation.java
+++ b/src/main/java/net/helenus/core/operation/AbstractStreamOperation.java
@@ -54,7 +54,7 @@ public abstract class AbstractStreamOperation<E, O extends AbstractStreamOperati
 
     public Stream<E> sync() {
         Tracer tracer = this.sessionOps.getZipkinTracer();
-        final Span cassandraSpan = (tracer != null && span != null) ? tracer.newChild(span.context()) : null;
+        final Span cassandraSpan = (tracer != null && traceContext != null) ? tracer.newChild(traceContext) : null;
         if (cassandraSpan != null) {
             cassandraSpan.name("cassandra");
             cassandraSpan.start();
@@ -72,7 +72,7 @@ public abstract class AbstractStreamOperation<E, O extends AbstractStreamOperati
 
 	public ListenableFuture<Stream<E>> async() {
         Tracer tracer = this.sessionOps.getZipkinTracer();
-        final Span cassandraSpan = (tracer != null && span != null) ? tracer.newChild(span.context()) : null;
+        final Span cassandraSpan = (tracer != null && traceContext != null) ? tracer.newChild(traceContext) : null;
         if (cassandraSpan != null) {
             cassandraSpan.name("cassandra");
             cassandraSpan.start();
diff --git a/src/main/java/net/helenus/core/reflect/MapperInvocationHandler.java b/src/main/java/net/helenus/core/reflect/MapperInvocationHandler.java
index 773c8ff..b77ba50 100644
--- a/src/main/java/net/helenus/core/reflect/MapperInvocationHandler.java
+++ b/src/main/java/net/helenus/core/reflect/MapperInvocationHandler.java
@@ -107,7 +107,7 @@ public class MapperInvocationHandler<E> implements InvocationHandler {
 
 		} else if (returnType.isEnum() && (value.getClass() == Integer.class || value.getClass() == int.class)) {
 		    try {
-                value = returnType.getClass().getEnumConstants()[(int) value];
+                value = Class.forName(returnType.getName()).getEnumConstants()[(Integer) value];
             } catch (ArrayIndexOutOfBoundsException e) {
 		        throw new IllegalArgumentException("invalid ordinal " + value + " for enum type " + returnType.getSimpleName());
             }