use URI instead of strings
Merge pull request #2 from anchor/technical-debt

use URI instead of strings