Event Participation - Refactor