Improved AuthContext