Added more formal tracing system