Additional small changes to the class Diagram