Add changes for transport_manager.