Updated the examples to use the Client mechanism