Updated events to match new event style