Connect integration Workaround