Making diagnose more readable
Making transport creation easier to read