updated AccountStoreClassFactory