Use new connect api

Authored by mlaurent on Tue, Apr 23, 11:16 AM.