Gradualy moving stuff from legacy model to OOXMLObject model