Updated UML diagram and slightly changed classes