Refactor for transport per messenger
Allow nil transport in wrap