WIP - Profiler related refactor and changes