Adapt to latest eventric API changes