MMLC-13 fix up data model so that we are ready to submit feedback for specific equation components.