Continue refactor of auth