Add support for automated auth