#396 Splitted connections per type