Adding basic tracing capabilities