change logic of uri method generation