Add base support for connections