Improvements to field value handling