Indexing: Update to current UPR specs