Refactoring AuthStore.