#12 Restructured BoUML model