Added tracing support

Makes sense; fine to leave here