CARE #86: Improved indicator management