Preparing to support different connection types