Move parent event-type collection into event class