Updated to support tracers and tracer analytics