Updates/Adds template events

cf. #877