Refine Client Event handling
Refine Client Event handling