Update Architecture to v2.=