Improve communication link generation