UPDATE: More cookie handling