MessageDispatcher patched to work with the moved address & andressType