Design and Architecture update