Incremental checkin of the tracing functionality