Added uniformed tracing of the source