adding Uri class (untested yet)