HUB-66 : Urn support