Adding more indicators and refactoring.