[#371][WIP] updated UML