Add IDiagnosticMessage for post beta-5 configuration support
Work in progress