Moved the tracing class down the hierarchy