Various changes

Adds multi-store support
Revert "Various changes"

This reverts commit 356b266bc050539235f8ae1e669efb24381e5e06.