Individual forms now account for nationality