Fixing Store Model