re-org for adding of store client to the api