Improved auth rules