Added ssh key handling
More changes to handle ssh keys