Added support for tracing.