Extended with full indicator names