Indicators calculation moved to Global Indicators