Added support for member and public events.