Enhance Client Management