Improved data label/value creation.