Improve connection module