Add support for server events