Updated profiler and profiled functions