Updated uml model