bug fix and extend store client getter class