Added comments around tracepoints