Restructured stores for better syncing