Added better support for handling lists of fields.