[#181][WIP] UML updated