Refactor IStore - add new Method for Search