Changed all URL into URI