Adding better tracing