GoodStore refactoring.