Updated base uri after discussion yesterday.
Made resource URIs property agnostic