Added indicator support