reworked Connections implementation