Revert "connection types added on demand"

This reverts commit e3c1207a23c76b0445d8f709905667a6d555068c.
Revert "api renamed"

This reverts commit 775930de2b6f0fae298d31a721eb9cbf08010b09.
Revert "api renamed"

This reverts commit 8ac86764e0157585e12c656a51afb765639b597b.
working again
working again