Added some abbreviations as discussed