Modified connection handling.