NDC and MDC support was added