CARE #66: Changed roles in indicators