Create branch trace-refactor