CARE #5: Updated indicator creation