Reworked how connections are configured