Architecture update