[Matahari] agent and object model consistency