Updated Uri class.