Add event id handling on server-side