[MOD] generator to use Uri address