Added URI's to more classes
Added URI's to more classes