* Added support for indicators