NOJIRA Partition refactor