Always sorts by last name, UML updated