Merge "Refactor code with single trace parser."