WIP #2 - Implement traceId