More auth refactor details.