Improved auth