Improved ssh types