Added additional template events