Improved the management of multi-valued fields
Added comments