Enhanced ApiKey capabilities for the Client class.  Had Client implement DataStore for convenience.