Changes to ObjectManager and ChatManager