Refactor user store.