Simplified field parsing
Simplified field name parsing