Add support of raw URL's.