partial store manager refactoring