Separate "Connection.handshake" into a mixin
Divide Connection into two classes