Redesign the builders and factories.
Change the MessageData to a dynamic.