[NUCXML-53] Support NUCCORE-1112 refactoring