Added support for Yubikey