Indicators functionality updated. Refactoring.