More architecture changes