Switched common objects to ObjectManager.