Better connection support