Change model->architecture, refine diagram