Refactor transport object