Further changes: indicators and Expert abstract class