ObjectManager: Update to become easier to understand