modularized Indicators a bit more