Updated modules to the latest Event standard