Use new connect api

Authored by mlaurent on Mon, Apr 22, 12:20 PM.