Add events property support