[FIX] Changes to field mappings to fit DSV specifications