Refactor stores