Updated for latest event format and features