Rewrite AbstractIndicator related class
Add new Indicator graph