Updates to getUri