changes to import mappings and some fields