Transport inheritance refactor