Refactor indicator -> indicator data association to use indicator ID, rather than external

 + start indicator update