Add more event types and paths