A few more architectural changes.