Expand abbreviation functionality added.