ADEN-1074 Use windows for source matching and convert to JSON-encoded strings for messages