Feature/indicator service refactor 2

I think `indicator-job(s)` could work as well