Rework SSL code to gather additional info