Added implementation of the Client interface