Improved Event markup