Cloud event handling - phase 3