MappedField refactor.