more complete MCD/MPD parsing