Change object model graph to CNDB