I'm not sure I understand.

All I did was move the embedded properties of the client handler to an argument.