MDD implementation in CSPOM was a bit extended.