New architecture changes