Moved functionality to transport plugins