-Support double dashes in all fields
-Add separators