Added tracing support