Enhance client connect