Refactoring Trace loader