chg: updated UML diagram as agreed during skype call