Add better AUTH support.