Change indicator class in order to support more than one provider
Closes #73
Merge branch 'enhancement-#73' into web