fieldsProcessing refactored