Generic indicator upgrades

More features for generic indicator