added connection support