Fixing the Store class