Added support for displaying values