[VP, TP] SignalIndicator refactored