Adding support for cookies