Sorted mappings.
Added more abbreviations.