Switched additional objects to the new object manager.