Got part of dispatcher to use the message structure