Re-arranged IndicatorComponent model structure