Added changes to cookie setting