Improve conversion tracking