Refactored for Authentication Converter.