Now using config mechanisms for field name mappings