Make visitor tracking more robust