little more structuring of transport and connector