Profiler rework WIP