Added all files from the new Tracer