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