Fixed issue: Fixed token and group name in Profiler
Fixed issue: Part of #424. Fixed profiling