Cloud event handling - phase 2