Add class diagrams and fixes issues related with nomenclature.