Added table tracing