Use dict comprehension for mapping values