Add events support