Fix selection of variables
Add sshkey support