Refactor ObjectManager.