Update to match CHAOS API change