Updated to use TransportMessage