Fixed type usage after removing URI class.