Remove unnecessary fields
Add value history to indicator, move indicator states to values