Add support for acronyms