Refactoring and adding more indicators.