Needed to support different indicators for advanced mode