Added support for indicator