Tentative adjustments to allow collections of objects.