Add support for optional event data.