Updated clas implementation to UML diagram revision 2 specification