Updated to support newest version og Ag.Event