[#62] Refactored authentication methods