Added cookieHandler support