CARE #25: Updated indicator creation, implemented @JsonView