added support for a few connections