Update the way architecture is determined to actually work.