UML updated due to changes on #37.