Refactoring Store