[NUCNEOFORJ-47] Support NUCCORE-1112 refactoring