Added classes from UML diagram