Refactor New Assignment feature.