Add support for using proper connection info
add tests and 3.x keymap