[Bug 39923] Add architecture field