refactoring transport manager