Rework connection to handle deferred start