Changes for Zipkin tracing integration