Profiler API tweaks