switching to more generic connection classes