Make use of the new event payload
Optimize the SQL parsing