Enhanced Auth System