Update code for event cloud release