Moving mdc field to subclasses in order to keep constructors and pattern matching backward compatible. Related to #3671