Imporoved cookie usage