Removed dependency on Profiler