Reorganized mandatory fields