Improved auth mechanism