Improved support for upcoming events from server

Better server side support for upcoming events