Added support for new uses of molid in OAPoC and OMFraF.