Recreated Store to fix issues