Changes related to better object model graph.