Updated ConnectionBuilder