Updated event lazy implementation