Issue #226 Redesign the message field metadata