Added URI generator class