Adding support for cookie options