Improve Profiler