Architecture Updated