Indicators

Updating indicator classes.