Further refactoring of the trace simulation capability