Added more efield logic to .tfrc