unit code field generation changes