Suboptimal client profiling
Improve client profiling