Improve connection