Refactored transport hierarchy