Add URL tracking and other refinements