Started rework for optional use in objects.