Improve connection workflow