Updated uml diagram