little change to uml, make it consistent to our current design