Further simplified the store & connection manager relationship.
6 files changed