Update events system

MAJ