Support SSH Keys Better