Added abbreviations functionality