Added Abbreviation class. Corresponding changes and some other stuff.