Improve abbreviation handling