Updated indicators with recursive methods to extend CachedIndicator in order to improve performance