I think they better belong in Transport since they're independent of the actual transport protocol (UDP, TCP...etc). Happy to remove the `-id` part.