Added acronyms support.