ObjectManager changes