Updated for new Event library