Cleaned up the creation of system stores. Created a SystemStoreClientFactory to handle this