Some architectural changes