Add support for public and private events