Add support for using proper connection info