Indicators reorganization