Refactor connection deferrables