Updated for new event library