working on ClientStore