Adjust to new api in EventCloud