Refactor using Transport.