Some more changes to cookie storage structure