Added support for profiler