WIP: NIDM-R support