Merge "Refactor map file to import role data only"