Updated events for better conversion handling