Updates for new object model and other bugfixes