Improved auth interface