Added field handling