Updated uml diagram (2)