Add back support for abbreviations