Fix #2: Add tracing support