Transport module refactored