More architecture changes.