Added support for gauge values