Hyperion - reworked Connection handling