Bring example uptodate and refactor uri stuff a bit