Fix architecture model constructor problem