[NUCJSON-44] Support NUCCORE-1112 refactoring