CURATOR-163 refactor