Changed to addressable for URI parsing