Updated UML accordingto #21