Further augmented IRI support