Changes in CanaryEntity according to API