Updated uml from daniel