Add support for connections