HUB-66 : Urn support
Merging with boiving