- Small changes to make the trace implementation work