More architecture optimization