Port to new connect api