REVIEW:P Make duration part of EventData