Add support to fields with double quotes