Added tracing queries