Improved profiler to support enterprise calls