Map MDC and NDC to CustomProperties