Abbreviation extension improvements