Added URI parsing.