Updated events export