Added support for gauge