Consistenyly use Uri type and terminology instead of Url and string