Fixed missing objects error by converting to ObjectManager.