More changes to implement UniformResource.