Changed Profiler to new system