[NUCNEODATIS-29] Support NUCCORE-1112 refactoring