[Auth] Improve auth methods