Add support for ConnectionContext