Feature/indicator service refactor 2