Improve connection process