Made event representations consistent throughout API