Refactoring ITransport