Improve BC with existing cookie data