Added basic routing to handshake class