Improve Connections signature