Improve mappings for diff