Refactoring of URI minting