updated calls to accept/support urn format where necessary