Adding handling for partial events