Improve client profiling ()