Architecture model level fixed