Use uri.lv
Some updates