Enhanced model and diagram