Fixed UML Classes