More work on profiler