REVIEW: Make duration part of EventData